From 633e948f31625932e1f1b3c3b70d34cc16048216 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 25 Sep 2012 11:16:11 -0500 Subject: [PATCH] loader: Ensure dependent modules are properly initialized. If an Asterisk module specifies a dependency in ast_module_info.nonoptreq, it is possible for Asterisk to skip calling the modules's .load function. Asterisk was loading and linking the module via load_dynamic_module() but was not adding the module to the resource_heap. Therefore the module was not initialized based on it's priority along with the other modules in the heap. Now use load_resource() instead of load_dynamic_module() for non-optional requirement. This will add the module to the resource_heap so the module can be properly initialized in the correct order. This is required if there are any module global data structures initialized in the .load() callback for the module on platforms which do not support weak references. (issue ASTERISK-20439) --- main/loader.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/main/loader.c b/main/loader.c index 36ac3da..c1dfc83 100644 --- a/main/loader.c +++ b/main/loader.c @@ -376,7 +376,9 @@ static void unload_dynamic_module(struct ast_module *mod) while (!dlclose(lib)); } -static struct ast_module *load_dynamic_module(const char *resource_in, unsigned int global_symbols_only) +static enum ast_module_load_result load_resource(const char *resource_name, unsigned int global_symbols_only, struct ast_heap *resource_heap, int required); + +static struct ast_module *load_dynamic_module(const char *resource_in, unsigned int global_symbols_only, struct ast_heap *resource_heap) { char fn[PATH_MAX] = ""; void *lib = NULL; @@ -445,11 +447,12 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned /* Force any required dependencies to load */ char *each, *required_resource = ast_strdupa(mod->info->nonoptreq); while ((each = strsep(&required_resource, ","))) { + struct ast_module *dependency; each = ast_strip(each); - + dependency = find_resource(each, 0); /* Is it already loaded? */ - if (!find_resource(each, 0)) { - load_dynamic_module(each, global_symbols_only); + if (!dependency) { + load_resource(each, global_symbols_only, resource_heap, 1); } } } @@ -807,6 +810,10 @@ static enum ast_module_load_result start_resource(struct ast_module *mod) char tmp[256]; enum ast_module_load_result res; + if (mod->flags.running) { + return AST_MODULE_LOAD_SUCCESS; + } + if (!mod->info->load) { return AST_MODULE_LOAD_FAILURE; } @@ -865,7 +872,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi return AST_MODULE_LOAD_SKIP; } else { #ifdef LOADABLE_MODULES - if (!(mod = load_dynamic_module(resource_name, global_symbols_only))) { + if (!(mod = load_dynamic_module(resource_name, global_symbols_only, resource_heap))) { /* don't generate a warning message during load_modules() */ if (!global_symbols_only) { ast_log(LOG_WARNING, "Module '%s' could not be loaded.\n", resource_name); -- 1.7.9.5