From b0b916c16c0e2bdd2e46b3b229e92260519a50fd Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sun, 27 Mar 2005 22:29:57 +0000 Subject: Fix app bug, update skel example, add skel to makefile as option (bug #3869) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5277 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_skel.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) (limited to 'apps/app_skel.c') diff --git a/apps/app_skel.c b/apps/app_skel.c index 47ab89f0e..fdfd64949 100755 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -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,63 @@ static char *synopsis = " 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, 1 }, + ['c'] = { OPTION_C, 2 } +}); + 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 *options=NULL; + char *dummy = NULL; + char *args; + int argc = 0; + char *opts[2]; + char *argv[2]; + + 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]; + options = argv[1]; + ast_parseoptions(app_opts, &flags, opts, options); + } + + + if (dummy && !ast_strlen_zero(dummy)) + ast_log(LOG_NOTICE, "Dummy value is : %s\n", dummy); + + if (ast_test_flag(&flags, OPTION_A)) + ast_log(LOG_NOTICE, "Option A is set\n"); + + if (ast_test_flag(&flags, OPTION_B)) + ast_log(LOG_NOTICE,"Option B is set with : %s\n", opts[0] ? opts[0] : ""); + + if (ast_test_flag(&flags, OPTION_C)) + ast_log(LOG_NOTICE,"Option C is set with : %s\n", opts[1] ? opts[1] : ""); + /* Do our thing here */ LOCAL_USER_REMOVE(u); return res; @@ -53,7 +98,7 @@ int unload_module(void) 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) -- cgit v1.2.3