apps/app_meetme: Apply default values on initial load with no config file

When the app_meetme module is loaded without its configuration file, the
module settings aren't initialized. In particular, this impacts the use
of logging realtime members. This patch guarantees that we always set the
default module settings on initial load.

Review: https://reviewboard.asterisk.org/r/4242/

ASTERISK-24572 #close
Reported by: Nuno Borges
patches:
  24572.patch uploaded by Nuno Borges (License 6116)
........

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

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 774b52e30f096e5e4666d6a659a1df9a1349ec44..4972128f2dd69c43627188e7257743184dde5d9d 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5775,12 +5775,29 @@ static enum ast_device_state meetmestate(const char *data)
        return AST_DEVICE_INUSE;
 }
 
-static void load_config_meetme(void)
+static void meetme_set_defaults(void)
+{
+       /*  Scheduling support is off by default */
+       rt_schedule = 0;
+       fuzzystart = 0;
+       earlyalert = 0;
+       endalert = 0;
+       extendby = 0;
+
+       /*  Logging of participants defaults to ON for compatibility reasons */
+       rt_log_members = 1;
+}
+
+static void load_config_meetme(int reload)
 {
        struct ast_config *cfg;
        struct ast_flags config_flags = { 0 };
        const char *val;
 
+       if (!reload) {
+               meetme_set_defaults();
+       }
+
        if (!(cfg = ast_config_load(CONFIG_FILE_NAME, config_flags))) {
                return;
        } else if (cfg == CONFIG_STATUS_FILEINVALID) {
@@ -5788,17 +5805,9 @@ static void load_config_meetme(void)
                return;
        }
 
-       audio_buffers = DEFAULT_AUDIO_BUFFERS;
-
-       /*  Scheduling support is off by default */
-       rt_schedule = 0;
-       fuzzystart = 0;
-       earlyalert = 0;
-       endalert = 0;
-       extendby = 0;
-
-       /*  Logging of participants defaults to ON for compatibility reasons */
-       rt_log_members = 1;  
+       if (reload) {
+               meetme_set_defaults();
+       }
 
        if ((val = ast_variable_retrieve(cfg, "general", "audiobuffers"))) {
                if ((sscanf(val, "%30d", &audio_buffers) != 1)) {
@@ -8005,7 +8014,7 @@ static struct ast_custom_function meetme_info_acf = {
 
 static int load_config(int reload)
 {
-       load_config_meetme();
+       load_config_meetme(reload);
        return sla_load_config(reload);
 }