From 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d Mon Sep 17 00:00:00 2001 From: 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: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_directed_pickup.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'apps/app_directed_pickup.c') diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index a8ef0e1c0..e75e34a26 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/app.h" -static const char *tdesc = "Directed Call Pickup Application"; static const char *app = "Pickup"; static const char *synopsis = "Directed Call Pickup"; static const char *descrip = @@ -134,37 +133,29 @@ static int pickup_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { + __mod_desc = mod; return ast_register_application(app, pickup_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Directed Call Pickup Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); -- cgit v1.2.3