Index: apps/app_skel.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v retrieving revision 1.8 diff -u -r1.8 app_skel.c --- apps/app_skel.c 12 Mar 2005 05:37:32 -0000 1.8 +++ apps/app_skel.c 26 Mar 2005 21:48:28 -0000 @@ -3,9 +3,9 @@ * * Skeleton application * - * Copyright (C) 1999, Mark Spencer + * Copyright (C) , * - * Mark Spencer + * <> * * This program is free software, distributed under the terms of * the GNU General Public License @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -27,19 +28,68 @@ " This is a skeleton application that shows you the basic structure to create your\n" "own asterisk applications.\n"; +#define OPTION_A (1 << 0) /* Option A */ +#define OPTION_B (1 << 1) /* Option B(n) */ +#define OPTION_C (1 << 2) /* Option C(str) */ +#define OPTION_NULL (1 << 3) /* Dummy Termination */ + +AST_DECLARE_OPTIONS(app_opts,{ + ['a'] = { OPTION_A }, + ['b'] = { OPTION_B, OPTION_B + 1}, + ['c'] = { OPTION_C, OPTION_C + 1} +}); + STANDARD_LOCAL_USER; LOCAL_USER_DECL; -static int skel_exec(struct ast_channel *chan, void *data) +static int app_exec(struct ast_channel *chan, void *data) { - int res=0; + int res = 0; + struct ast_flags flags; struct localuser *u; + char *opts[OPTION_NULL]; + char *options=NULL; + char *dummy = NULL; + char *args; + int argc = 0; + char *argv[5]; + + if (!(args = ast_strdupa((char *)data))) { + ast_log(LOG_ERROR, "Out of memory!\n"); + return -1; + } + if (!data) { - ast_log(LOG_WARNING, "skel requires an argument (filename)\n"); + ast_log(LOG_WARNING, "%s requires an argument (dummy|[options])\n",app); return -1; } + LOCAL_USER_ADD(u); + if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(char *)))) { + dummy = argv[0]; + if ( argc > 1) { + options = argv[1]; + } + if (ast_strlen_zero(dummy)) { + dummy = NULL; + } + } + + ast_parseoptions(app_opts, &flags, opts, data); + + if (!ast_strlen_zero(dummy)) + ast_log(LOG_WARNING, "Dummy value is : %s\n", dummy); + + if (ast_test_flag(&flags, OPTION_A)) + ast_log(LOG_WARNING, "Option A is set\n"); + + if (ast_test_flag(&flags, OPTION_C)) + ast_log(LOG_WARNING,"Option B is set with : %s\n", opts[OPTION_B]); + + if (ast_test_flag(&flags, OPTION_C)) + ast_log(LOG_WARNING,"Option C is set with : %s\n", opts[OPTION_C]); + /* Do our thing here */ LOCAL_USER_REMOVE(u); return res; @@ -53,7 +103,7 @@ int load_module(void) { - return ast_register_application(app, skel_exec, tdesc, synopsis); + return ast_register_application(app, app_exec, tdesc, synopsis); } char *description(void)