kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily revert revision 89325, which added md5 magic for keeping track of

Browse Source 
what build options were used.  We agreed that we should remove this before
making a 1.4 release, and then we can put it back in.  Then, we can take a
month or so to play around with it to get it how we want it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-11-16 22:26:44 +00:00
parent 22b119d188
commit 12d60508f3
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_tools/make_buildopts_h
View File

@@ -14,7 +14,4 @@ done
if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
then then
echo "#define AST_DEVMODE 1" echo "#define AST_DEVMODE 1"
TMP="${TMP} AST_DEVMODE"
fi fi
BUILDSUM=`echo ${TMP} | md5sum`
echo "#define AST_BUILDOPT_SUM {0x${BUILDSUM:0:8}, 0x${BUILDSUM:8:8}, 0x${BUILDSUM:16:8}, 0x${BUILDSUM:24:8}}"

5
include/asterisk/module.h
View File

@@ -203,7 +203,6 @@ struct ast_module_info {
const char *key; const char *key;
unsigned int flags; unsigned int flags;
unsigned int buildopt_sum[4]; /* The value of AST_BUILDOPT_SUM when this module was compiled */
}; };
void ast_module_register(const struct ast_module_info *); void ast_module_register(const struct ast_module_info *);
@@ -230,8 +229,7 @@ void ast_module_unref(struct ast_module *);
AST_MODULE, \ AST_MODULE, \
desc, \ desc, \
keystr, \ keystr, \
flags_to_set, \ flags_to_set \
AST_BUILDOPT_SUM, \
}; \ }; \
static void __attribute__ ((constructor)) __reg_module(void) \ static void __attribute__ ((constructor)) __reg_module(void) \
{ \ { \
@@ -261,7 +259,6 @@ const static __attribute__((unused)) struct ast_module_info *ast_module_info;
.flags = flags_to_set, \ .flags = flags_to_set, \
.description = desc, \ .description = desc, \
.key = keystr, \ .key = keystr, \
.buildopt_sum = AST_BUILDOPT_SUM, \
fields \ fields \
}; \ }; \
static void __attribute__ ((constructor)) __reg_module(void) \ static void __attribute__ ((constructor)) __reg_module(void) \

11
main/loader.c
View File

@@ -76,8 +76,6 @@ static unsigned char expected_key[] =
{ 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3, { 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3,
0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 }; 0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 };
static unsigned int buildopt_sum[4] = AST_BUILDOPT_SUM;
static unsigned int embedding = 1; /* we always start out by registering embedded modules, static unsigned int embedding = 1; /* we always start out by registering embedded modules,
since they are here before we dlopen() any since they are here before we dlopen() any
*/ */
@@ -600,8 +598,6 @@ int ast_module_reload(const char *name)
static unsigned int inspect_module(const struct ast_module *mod) static unsigned int inspect_module(const struct ast_module *mod)
{ {
unsigned int buildopt_empty[4] = { 0, };
if (!mod->info->description) { if (!mod->info->description) {
ast_log(LOG_WARNING, "Module '%s' does not provide a description.\n", mod->resource); ast_log(LOG_WARNING, "Module '%s' does not provide a description.\n", mod->resource);
return 1; return 1;
@@ -617,13 +613,6 @@ static unsigned int inspect_module(const struct ast_module *mod)
return 1; return 1;
} }
if (memcmp(buildopt_empty, mod->info->buildopt_sum, sizeof(buildopt_empty)) &&
memcmp(buildopt_sum, mod->info->buildopt_sum, sizeof(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' will not be initialized as it may cause instability.\n", mod->resource);
return 1;
}
return 0; return 0;
} }