[Asterisk-Dev] Dynamic loader changes

[Thorsten Lockert]

This diff changes the loader to try symbols with an underline
prepended if they are not found without.  In addition it will
also work on systems that does not have RTLD_GLOBAL or RTLD_NOW
symbols.

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 loader.c
--- loader.c	12 Feb 2003 13:59:13 -0000	1.1.1.1
+++ loader.c	23 Apr 2003 16:49:41 -0000
@@ -30,6 +30,10 @@
 #include "asterisk.h"
 #include "astconf.h"
 
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
+
 static char expected_key[] =
 { 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75,
   0xff, 0x8b, 0xa9, 0xbe, 0x7c, 0x43, 0x74, 0x63 };
@@ -174,14 +178,20 @@
 		cfg = ast_load(AST_MODULE_CONFIG);
 		option_verbose = o;
 		if (cfg) {
+#ifdef RTLD_GLOBAL
 			if ((val = ast_variable_retrieve(cfg, "global", resource_name))
 					&& ast_true(val))
 				flags |= RTLD_GLOBAL;
+#endif
 			ast_destroy(cfg);
 		}
 	} else {
 		/* Resource modules are always loaded global and lazy */
+#ifdef RTLD_GLOBAL
 		flags = (RTLD_GLOBAL | RTLD_LAZY);
+#else
+		flags = RTLD_LAZY;
+#endif
 	}
 	
 	if (ast_pthread_mutex_lock(&modlock))
@@ -215,31 +225,43 @@
 		return -1;
 	}
 	m->load_module = dlsym(m->lib, "load_module");
+	if (m->load_module == NULL)
+		m->load_module = dlsym(m->lib, "_load_module");
 	if (!m->load_module) {
 		ast_log(LOG_WARNING, "No load_module in module %s\n", fn);
 		errors++;
 	}
 	m->unload_module = dlsym(m->lib, "unload_module");
+	if (m->unload_module == NULL)
+		m->unload_module = dlsym(m->lib, "_unload_module");
 	if (!m->unload_module) {
 		ast_log(LOG_WARNING, "No unload_module in module %s\n", fn);
 		errors++;
 	}
 	m->usecount = dlsym(m->lib, "usecount");
+	if (m->usecount == NULL)
+		m->usecount = dlsym(m->lib, "_usecount");
 	if (!m->usecount) {
 		ast_log(LOG_WARNING, "No usecount in module %s\n", fn);
 		errors++;
 	}
 	m->description = dlsym(m->lib, "description");
+	if (m->description == NULL)
+		m->description = dlsym(m->lib, "_description");
 	if (!m->description) {
 		ast_log(LOG_WARNING, "No description in module %s\n", fn);
 		errors++;
 	}
 	m->key = dlsym(m->lib, "key");
+	if (m->key == NULL)
+		m->key = dlsym(m->lib, "_key");
 	if (!m->key) {
 		ast_log(LOG_WARNING, "No key routine in module %s\n", fn);
 		errors++;
 	}
 	m->reload = dlsym(m->lib, "reload");
+	if (m->reload == NULL)
+		m->reload = dlsym(m->lib, "_reload");
 	if (m->key && !(key = m->key())) {
 		ast_log(LOG_WARNING, "Key routine returned NULL in module %s\n", fn);
 		errors++;
--
Thorsten Lockert      | tholo at sigmasoft.com | Universe, n.:
2121 N. Lakeshore Dr. | tholo at openbsd.org   |         The problem.
Chapel Hill, NC 27514 |                     |