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

1 files changed, 6 insertions, 11 deletions

diff --git a/res/res_crypto.c b/res/res_crypto.c
index ea0f05ae6..d7c74d79f 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -581,13 +581,13 @@ static int crypto_init(void)
 	return 0;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	crypto_load(-1, -1);
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	crypto_init();
 	if (ast_opt_init_keys)
@@ -597,24 +597,19 @@ int load_module(void)
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	/* Can't unload this once we're loaded */
 	return -1;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return "Cryptographic Digital Signatures";
 }
 
-int usecount(void)
-{
-	/* We should never be unloaded */
-	return 1;
-}
-
-const char *key(void)
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL);