Allow shutdown to unload modules that register bucket scheme's or codec's.

* Change __ast_module_shutdown_ref to be NULL safe (11+).
* Allow modules that call ast_bucket_scheme_register or ast_codec_register
  to be unloaded during graceful shutdown only (13+ only).

ASTERISK-24796 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4428/
........

Merged revisions 432058 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 432059 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432060 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/bucket.c b/main/bucket.c
index 78a2289fd0793d88004e764dd0043dcaa0828352..90397f1f9b10fa0d8c0b59c4b9b05d66e2fe69b4 100644 (file)
--- a/main/bucket.c
+++ b/main/bucket.c
@@ -282,7 +282,7 @@ int __ast_bucket_scheme_register(const char *name, struct ast_sorcery_wizard *bu
 
        ast_verb(2, "Registered bucket scheme '%s'\n", name);
 
-       ast_module_ref(module);
+       ast_module_shutdown_ref(module);
 
        return 0;
 }

diff --git a/main/codec.c b/main/codec.c
index 19e78fa675a07aa92cde8d2c49bf117f1217498c..45f2edf2baf7c2902602a070c9ea7c14a9fa0f9b 100644 (file)
--- a/main/codec.c
+++ b/main/codec.c
@@ -296,8 +296,8 @@ int __ast_codec_register(struct ast_codec *codec, struct ast_module *mod)
 
        ao2_link_flags(codecs, codec_new, OBJ_NOLOCK);
 
-       /* Once registered a codec can not be unregistered, and the module must persist */
-       ast_module_ref(mod);
+       /* Once registered a codec can not be unregistered, and the module must persist until shutdown */
+       ast_module_shutdown_ref(mod);
 
        ast_verb(2, "Registered '%s' codec '%s' at sample rate '%u' with id '%u'\n",
                ast_codec_media_type2str(codec->type), codec->name, codec->sample_rate, codec_new->id);

diff --git a/main/loader.c b/main/loader.c
index 5d644ed6bc9dfb9f0644e1686ae73d0301a6981f..b14914acbad52597d3d08f69e661e813b7edaf18 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -1484,10 +1484,12 @@ struct ast_module *__ast_module_ref(struct ast_module *mod, const char *file, in
 
 void __ast_module_shutdown_ref(struct ast_module *mod, const char *file, int line, const char *func)
 {
-       if (!mod->flags.keepuntilshutdown) {
-               __ast_module_ref(mod, file, line, func);
-               mod->flags.keepuntilshutdown = 1;
+       if (!mod || mod->flags.keepuntilshutdown) {
+               return;
        }
+
+       __ast_module_ref(mod, file, line, func);
+       mod->flags.keepuntilshutdown = 1;
 }
 
 void __ast_module_unref(struct ast_module *mod, const char *file, int line, const char *func)