From 8b0c007ad990aa27d9868da49215fd1076ac77cc Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 21 Aug 2006 02:11:39 +0000 Subject: merge new_loader_completion branch, including (at least): - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_zapateller.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'apps/app_zapateller.c') diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 21f6e2fa4..06941b16a 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -41,8 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/translate.h" -static char *tdesc = "Block Telemarketers with Special Information Tone"; - static char *app = "Zapateller"; static char *synopsis = "Block telemarketers with SIT"; @@ -56,17 +54,16 @@ static char *descrip = "is no callerid information available. Options should be separated by |\n" "characters\n"; -LOCAL_USER_DECL; static int zapateller_exec(struct ast_channel *chan, void *data) { int res = 0; - struct localuser *u; + struct ast_module_user *u; int answer = 0, nocallerid = 0; char *c; char *stringp=NULL; - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); stringp=data; c = strsep(&stringp, "|"); @@ -89,7 +86,7 @@ static int zapateller_exec(struct ast_channel *chan, void *data) } } if (chan->cid.cid_num && nocallerid) { - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return res; } if (!res) @@ -100,34 +97,24 @@ static int zapateller_exec(struct ast_channel *chan, void *data) res = ast_tonepair(chan, 1800, 0, 330, 0); if (!res) res = ast_tonepair(chan, 0, 0, 1000, 0); - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return res; } -static int unload_module(void *mod) +static int unload_module(void) { int res; res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { return ast_register_application(app, zapateller_exec, synopsis, descrip); } -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone"); -- cgit v1.2.3