aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_zapscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/app_zapscan.c')
-rw-r--r--apps/app_zapscan.c27
1 files changed, 7 insertions, 20 deletions
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index d0a017072..690d9a5cc 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -59,8 +59,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/say.h"
-static char *tdesc = "Scan Zap channels application";
-
static char *app = "ZapScan";
static char *synopsis = "Scan Zap channels to monitor calls";
@@ -70,7 +68,6 @@ static char *descrip =
"a convenient way. Use '#' to select the next channel and use '*' to exit\n"
"Limit scanning to a channel GROUP by setting the option group argument.\n";
-LOCAL_USER_DECL;
#define CONF_SIZE 160
@@ -290,7 +287,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags)
static int conf_exec(struct ast_channel *chan, void *data)
{
int res=-1;
- struct localuser *u;
+ struct ast_module_user *u;
int confflags = 0;
int confno = 0;
char confstr[80] = "", *tmp = NULL;
@@ -299,7 +296,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
char *desired_group;
int input=0,search_group=0;
- LOCAL_USER_ADD(u);
+ u = ast_module_user_add(chan);
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
@@ -360,35 +357,25 @@ static int conf_exec(struct ast_channel *chan, void *data)
ast_mutex_unlock(&tempchan->lock);
lastchan = tempchan;
}
- 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, "Scan Zap channels application");