kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

codec_speex.c: Cleanup module loading to DECLINE and not FAILURE.

Browse Source 
If codec_speex fails to register a translator it would cause Asterisk to
exit instead of continue as a DECLINED module.

* Make unload_module() always return 0.  It is silly to fail unloading if
any translators we try to unregister were not even registered.

Change-Id: Ia262591f68333dad17673ba7104d11c88096f51a
This commit is contained in:
Richard Mudgett
2018-10-04 11:49:09 -05:00
parent 6fd21a6af6
commit bc335ceda8
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
codecs/codec_speex.c
View File

@@ -689,39 +689,37 @@ static int reload(void)
static int unload_module(void) static int unload_module(void)
{ {
int res = 0; ast_unregister_translator(&speextolin);
ast_unregister_translator(&lintospeex);
ast_unregister_translator(&speexwbtolin16);
ast_unregister_translator(&lin16tospeexwb);
ast_unregister_translator(&speexuwbtolin32);
ast_unregister_translator(&lin32tospeexuwb);
res |= ast_unregister_translator(&speextolin); return 0;
res |= ast_unregister_translator(&lintospeex);
res |= ast_unregister_translator(&speexwbtolin16);
res |= ast_unregister_translator(&lin16tospeexwb);
res |= ast_unregister_translator(&speexuwbtolin32);
res |= ast_unregister_translator(&lin32tospeexuwb);
return res;
} }
static int load_module(void) static int load_module(void)
{ {
int res = 0; int res = 0;
if (parse_config(0)) if (parse_config(0)) {
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
}
/* XXX It is most likely a bug in this module if we fail to register a translator */
res |= ast_register_translator(&speextolin); res |= ast_register_translator(&speextolin);
res |= ast_register_translator(&lintospeex); res |= ast_register_translator(&lintospeex);
res |= ast_register_translator(&speexwbtolin16); res |= ast_register_translator(&speexwbtolin16);
res |= ast_register_translator(&lin16tospeexwb); res |= ast_register_translator(&lin16tospeexwb);
res |= ast_register_translator(&speexuwbtolin32); res |= ast_register_translator(&speexuwbtolin32);
res |= ast_register_translator(&lin32tospeexuwb); res |= ast_register_translator(&lin32tospeexuwb);
if (res) { if (res) {
unload_module(); unload_module();
return res; return AST_MODULE_LOAD_DECLINE;
} }
return res; return AST_MODULE_LOAD_SUCCESS;
} }
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder", AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder",