kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
........

Merged revisions 429028 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-12-06 17:27:22 +00:00
parent 67372d1f0a
commit 0321d00413
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/app_meetme.c
View File

@@ -5770,21 +5770,8 @@ 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)
{
struct ast_config *cfg;
struct ast_flags config_flags = { 0 };
const char *val;
if (!(cfg = ast_config_load(CONFIG_FILE_NAME, config_flags))) {
return;
} else if (cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_ERROR, "Config file " CONFIG_FILE_NAME " is in an invalid format. Aborting.\n");
return;
}
audio_buffers = DEFAULT_AUDIO_BUFFERS;
/* Scheduling support is off by default */
rt_schedule = 0;
fuzzystart = 0;
@@ -5793,7 +5780,29 @@ static void load_config_meetme(void)
extendby = 0;
/* Logging of participants defaults to ON for compatibility reasons */
rt_log_members = 1;
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) {
ast_log(LOG_ERROR, "Config file " CONFIG_FILE_NAME " is in an invalid format. Aborting.\n");
return;
}
if (reload) {
meetme_set_defaults();
}
if ((val = ast_variable_retrieve(cfg, "general", "audiobuffers"))) {
if ((sscanf(val, "%30d", &audio_buffers) != 1)) {
@@ -8000,7 +8009,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);
}