From e43bc6634dc60ca897a848ca3301f52c74330279 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 14 Apr 2006 14:08:19 +0000 Subject: This rather large commit changes the way modules are loaded. As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/pbx_loopback.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'pbx/pbx_loopback.c') diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index cadd73a14..a88f20e9f 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/crypto.h" #include "asterisk/astdb.h" -static char *tdesc = "Loopback Switch"; /* Loopback switch substitutes ${EXTEN}, ${CONTEXT}, and ${PRIORITY} into the data passed to it to try to get a string of the form: @@ -169,30 +168,27 @@ static struct ast_switch loopback_switch = matchmore: loopback_matchmore, }; -const char *description(void) +static const char *description(void) { - return tdesc; + return "Loopback Switch"; } -int usecount(void) -{ - return 1; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } -int unload_module(void) +static int unload_module(void *mod) { ast_unregister_switch(&loopback_switch); return 0; } -int load_module(void) +static int load_module(void *mod) { ast_register_switch(&loopback_switch); return 0; } +/* XXX really no unload ? */ +STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL); -- cgit v1.2.3