diff options
Diffstat (limited to 'apps/app_zapbarge.c')
-rw-r--r-- | apps/app_zapbarge.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 843e6151a..735020f60 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -60,8 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/say.h" #include "asterisk/utils.h" -static char *tdesc = "Barge in on Zap channel application"; - static char *app = "ZapBarge"; static char *synopsis = "Barge in (monitor) Zap channel"; @@ -72,7 +70,6 @@ static char *descrip = "-1 when caller user hangs up and is independent of the\n" "state of the channel being monitored."; -LOCAL_USER_DECL; #define CONF_SIZE 160 @@ -263,19 +260,19 @@ outrun: static int conf_exec(struct ast_channel *chan, void *data) { int res=-1; - struct localuser *u; + struct ast_module_user *u; int retrycnt = 0; int confflags = 0; int confno = 0; char confstr[80] = ""; - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); if (!ast_strlen_zero(data)) { if ((sscanf(data, "Zap/%d", &confno) != 1) && (sscanf(data, "%d", &confno) != 1)) { ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data); - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return 0; } } @@ -298,35 +295,24 @@ static int conf_exec(struct ast_channel *chan, void *data) } out: /* Do the conference */ - 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, conf_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, "Barge in on Zap channel application"); |