diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /apps/app_test.c | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) |
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
Diffstat (limited to 'apps/app_test.c')
-rw-r--r-- | apps/app_test.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/apps/app_test.c b/apps/app_test.c index 885dd2572..b38fe4ca7 100644 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -48,10 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/utils.h" -LOCAL_USER_DECL; - -static char *tdesc = "Interface Test Application"; - static char *tests_descrip = "TestServer(): Perform test server function and write call report.\n" "Results stored in /var/log/asterisk/testreports/<testid>-server.txt"; @@ -133,7 +129,7 @@ static int sendnoise(struct ast_channel *chan, int ms) static int testclient_exec(struct ast_channel *chan, void *data) { - struct localuser *u; + struct ast_module_user *u; int res = 0; char *testid=data; char fn[80]; @@ -146,7 +142,7 @@ static int testclient_exec(struct ast_channel *chan, void *data) return -1; } - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); if (chan->_state != AST_STATE_UP) res = ast_answer(chan); @@ -318,18 +314,18 @@ static int testclient_exec(struct ast_channel *chan, void *data) ast_log(LOG_NOTICE, "Did not read a test ID on '%s'\n", chan->name); res = -1; } - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return res; } static int testserver_exec(struct ast_channel *chan, void *data) { - struct localuser *u; + struct ast_module_user *u; int res = 0; char testid[80]=""; char fn[80]; FILE *f; - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); if (chan->_state != AST_STATE_UP) res = ast_answer(chan); /* Read version */ @@ -487,23 +483,23 @@ static int testserver_exec(struct ast_channel *chan, void *data) ast_log(LOG_NOTICE, "Did not read a test ID on '%s'\n", chan->name); res = -1; } - 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(testc_app); res |= ast_unregister_application(tests_app); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { int res; @@ -513,14 +509,4 @@ static int load_module(void *mod) return res; } -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, "Interface Test Application"); |