kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix app bug, update skel example, add skel to makefile as option (bug #3869)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-27 22:29:57 +00:00
parent 03da4fbf3b
commit b0b916c16c
3 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app.c
View File

@@ -1489,7 +1489,8 @@ int ast_parseoptions(const struct ast_option *options, struct ast_flags *flags,
ast_log(LOG_WARNING, "Missing closing parenthesis for argument '%c'\n", curarg);
res = -1;
}
}
} else if (argloc)
args[argloc - 1] = NULL;
}
return res;
}

1
apps/Makefile
View File

@@ -50,6 +50,7 @@ endif
# Experimental things
#
#APPS+=app_ivrdemo.so
#APPS+=app_skel.so
APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)

59
apps/app_skel.c
View File

@@ -3,9 +3,9 @@
*
* Skeleton application
*
* Copyright (C) 1999, Mark Spencer
* Copyright (C) <Year>, <Your Name Here>
*
* Mark Spencer <markster@linux-support.net>
* <Your Name Here> <<You Email Here>>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
@@ -17,6 +17,7 @@
#include <asterisk/pbx.h>
#include <asterisk/module.h>
#include <asterisk/lock.h>
#include <asterisk/app.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@ -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;
if (!data) {
ast_log(LOG_WARNING, "skel requires an argument (filename)\n");
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, "%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] : "<unspecified>");
if (ast_test_flag(&flags, OPTION_C))
ast_log(LOG_NOTICE,"Option C is set with : %s\n", opts[1] ? opts[1] : "<unspecified>");
/* 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)