kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a new module flag to indicate that a build sum is present. Modules built

Browse Source 
against older Asterisk 1.4 headers will now load properly with just a warning
indicating that they are old and may cause problems.
(patch by paravoid)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@91501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-12-06 19:11:35 +00:00
parent 6af6d06e75
commit 0522e3d872
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/module.h
View File

@@ -179,6 +179,7 @@ struct ast_module_user_list;
enum ast_module_flags { enum ast_module_flags {
AST_MODFLAG_DEFAULT = 0, AST_MODFLAG_DEFAULT = 0,
AST_MODFLAG_GLOBAL_SYMBOLS = (1 << 0), AST_MODFLAG_GLOBAL_SYMBOLS = (1 << 0),
AST_MODFLAG_BUILDSUM = (1 << 1),
}; };
struct ast_module_info { struct ast_module_info {
@@ -233,7 +234,7 @@ void ast_module_unref(struct ast_module *);
AST_MODULE, \ AST_MODULE, \
desc, \ desc, \
keystr, \ keystr, \
flags_to_set, \ flags_to_set | AST_MODFLAG_BUILDSUM, \
AST_BUILDOPT_SUM, \ AST_BUILDOPT_SUM, \
}; \ }; \
static void __attribute__ ((constructor)) __reg_module(void) \ static void __attribute__ ((constructor)) __reg_module(void) \
@@ -261,7 +262,7 @@ const static __attribute__((unused)) struct ast_module_info *ast_module_info;
#define AST_MODULE_INFO(keystr, flags_to_set, desc, fields...) \ #define AST_MODULE_INFO(keystr, flags_to_set, desc, fields...) \
static struct ast_module_info __mod_info = { \ static struct ast_module_info __mod_info = { \
.name = AST_MODULE, \ .name = AST_MODULE, \
.flags = flags_to_set, \ .flags = flags_to_set | AST_MODFLAG_BUILDSUM, \
.description = desc, \ .description = desc, \
.key = keystr, \ .key = keystr, \
.buildopt_sum = AST_BUILDOPT_SUM, \ .buildopt_sum = AST_BUILDOPT_SUM, \

6
main/loader.c
View File

@@ -616,8 +616,10 @@ static unsigned int inspect_module(const struct ast_module *mod)
return 1; return 1;
} }
if (!ast_strlen_zero(mod->info->buildopt_sum) && if (!ast_test_flag(mod->info, AST_MODFLAG_BUILDSUM)) {
strcmp(buildopt_sum, mod->info->buildopt_sum)) { ast_log(LOG_WARNING, "Module '%s' was not compiled against a recent version of Asterisk and may cause instability.\n", mod->resource);
} else if (!ast_strlen_zero(mod->info->buildopt_sum) &&
strcmp(buildopt_sum, mod->info->buildopt_sum)) {
ast_log(LOG_WARNING, "Module '%s' was not compiled with the same compile-time options as this version of Asterisk.\n", mod->resource); ast_log(LOG_WARNING, "Module '%s' was not compiled with the same compile-time options as this version of Asterisk.\n", mod->resource);
ast_log(LOG_WARNING, "Module '%s' will not be initialized as it may cause instability.\n", mod->resource); ast_log(LOG_WARNING, "Module '%s' will not be initialized as it may cause instability.\n", mod->resource);
return 1; return 1;