extra error checking.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7559 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
ee70dcd1d2
commit
62a9f72590
|
@ -856,7 +856,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
switch_mutex_lock(conference->mutex);
|
switch_mutex_lock(conference->mutex);
|
||||||
ready = has_file_data = total = 0;
|
has_file_data = ready = total = 0;
|
||||||
|
|
||||||
/* Read one frame of audio from each member channel and save it for redistribution */
|
/* Read one frame of audio from each member channel and save it for redistribution */
|
||||||
for (imember = conference->members; imember; imember = imember->next) {
|
for (imember = conference->members; imember; imember = imember->next) {
|
||||||
|
|
|
@ -138,7 +138,7 @@ static switch_status_t config_logger(void)
|
||||||
#else
|
#else
|
||||||
COLORIZE = 1;
|
COLORIZE = 1;
|
||||||
#endif
|
#endif
|
||||||
} else if (!strcasecmp(var, "loglevel")) {
|
} else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) {
|
||||||
hard_log_level = switch_log_str2level(val);
|
hard_log_level = switch_log_str2level(val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -265,23 +265,23 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
|
||||||
char *var = (char *) switch_xml_attr_soft(param, "name");
|
char *var = (char *) switch_xml_attr_soft(param, "name");
|
||||||
char *val = (char *) switch_xml_attr_soft(param, "value");
|
char *val = (char *) switch_xml_attr_soft(param, "value");
|
||||||
|
|
||||||
if (!strcasecmp(var, "cred")) {
|
if (!strcasecmp(var, "cred") && !switch_strlen_zero(val)) {
|
||||||
globals.cred = strdup(val);
|
globals.cred = strdup(val);
|
||||||
} else if (!strcasecmp(var, "url")) {
|
} else if (!strcasecmp(var, "url") && !switch_strlen_zero(val)) {
|
||||||
globals.url = strdup(val);
|
globals.url = strdup(val);
|
||||||
} else if (!strcasecmp(var, "delay")) {
|
} else if (!strcasecmp(var, "delay") && !switch_strlen_zero(val)) {
|
||||||
globals.delay = (uint32_t) atoi(val);
|
globals.delay = (uint32_t) atoi(val);
|
||||||
} else if (!strcasecmp(var, "log-b-leg")) {
|
} else if (!strcasecmp(var, "log-b-leg")) {
|
||||||
globals.log_b = switch_true(val);
|
globals.log_b = switch_true(val);
|
||||||
} else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) {
|
} else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) {
|
||||||
globals.disable100continue = 1;
|
globals.disable100continue = 1;
|
||||||
} else if (!strcasecmp(var, "encode")) {
|
} else if (!strcasecmp(var, "encode") && !switch_strlen_zero(val)) {
|
||||||
if (!strcasecmp(val, "base64")) {
|
if (!strcasecmp(val, "base64")) {
|
||||||
globals.encode = 2;
|
globals.encode = 2;
|
||||||
} else {
|
} else {
|
||||||
globals.encode = switch_true(val) ? 1 : 0;
|
globals.encode = switch_true(val) ? 1 : 0;
|
||||||
}
|
}
|
||||||
} else if (!strcasecmp(var, "retries")) {
|
} else if (!strcasecmp(var, "retries") && !switch_strlen_zero(val)) {
|
||||||
globals.retries = (uint32_t) atoi(val);
|
globals.retries = (uint32_t) atoi(val);
|
||||||
} else if (!strcasecmp(var, "log-dir")) {
|
} else if (!strcasecmp(var, "log-dir")) {
|
||||||
if (switch_strlen_zero(val)) {
|
if (switch_strlen_zero(val)) {
|
||||||
|
|
Loading…
Reference in New Issue