mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-24 21:22:09 +00:00
normalize configuration parameters to use - instead of _.
Break everybody's configuration. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1475 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -67,9 +67,7 @@ static void load_config(void)
|
||||
char *var = (char *) switch_xml_attr(param, "name");
|
||||
char *val = (char *) switch_xml_attr(param, "value");
|
||||
|
||||
if (!strcmp(var, "directory_name") && val) {
|
||||
set_global_directory_name(val);
|
||||
} else if (!strcmp(var, "directory_name") && val) {
|
||||
if (!strcmp(var, "directory-name") && val) {
|
||||
set_global_directory_name(val);
|
||||
} else if (!strcmp(var, "host") && val) {
|
||||
set_global_host(val);
|
||||
|
||||
@@ -1310,11 +1310,11 @@ static switch_status_t load_config(void)
|
||||
|
||||
if (!strcasecmp(var, "debug")) {
|
||||
globals.debug = atoi(val);
|
||||
} else if (!strcasecmp(var, "codec_prefs")) {
|
||||
} else if (!strcasecmp(var, "codec-prefs")) {
|
||||
set_global_codec_string(val);
|
||||
globals.codec_order_last =
|
||||
switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
|
||||
} else if (!strcasecmp(var, "codec_rates")) {
|
||||
} else if (!strcasecmp(var, "codec-rates")) {
|
||||
set_global_codec_rates_string(val);
|
||||
globals.codec_rates_last =
|
||||
switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
|
||||
|
||||
@@ -1912,12 +1912,12 @@ static int config_exosip(int reload)
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Add Realm [%s][%s]\n", name, val);
|
||||
switch_core_hash_insert(globals.srtp_hash, switch_core_strdup(module_pool, name), switch_core_strdup(module_pool, val));
|
||||
}
|
||||
} else if (!strcmp(var, "codec_prefs")) {
|
||||
} else if (!strcmp(var, "codec-prefs")) {
|
||||
set_global_codec_string(val);
|
||||
globals.codec_order_last = switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
|
||||
} else if (!strcmp(var, "codec_ms")) {
|
||||
} else if (!strcmp(var, "codec-ms")) {
|
||||
globals.codec_ms = atoi(val);
|
||||
} else if (!strcmp(var, "dtmf_duration")) {
|
||||
} else if (!strcmp(var, "dtmf-duration")) {
|
||||
int dur = atoi(val);
|
||||
if (dur > 10 && dur < 8000) {
|
||||
globals.dtmf_duration = dur;
|
||||
|
||||
@@ -838,17 +838,17 @@ static switch_status_t load_config(void)
|
||||
globals.port = atoi(val);
|
||||
} else if (!strcmp(var, "ip")) {
|
||||
set_global_ip(val);
|
||||
} else if (!strcmp(var, "codec_master")) {
|
||||
} else if (!strcmp(var, "codec-master")) {
|
||||
if (!strcasecmp(val, "us")) {
|
||||
switch_set_flag(&globals, GFLAG_MY_CODEC_PREFS);
|
||||
}
|
||||
} else if (!strcmp(var, "dialplan")) {
|
||||
set_global_dialplan(val);
|
||||
} else if (!strcmp(var, "codec_prefs")) {
|
||||
} else if (!strcmp(var, "codec-prefs")) {
|
||||
set_global_codec_string(val);
|
||||
globals.codec_order_last =
|
||||
switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
|
||||
} else if (!strcmp(var, "codec_rates")) {
|
||||
} else if (!strcmp(var, "codec-rates")) {
|
||||
set_global_codec_rates_string(val);
|
||||
globals.codec_rates_last =
|
||||
switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
|
||||
|
||||
@@ -583,13 +583,13 @@ static switch_status_t load_config(void)
|
||||
|
||||
if (!strcmp(var, "debug")) {
|
||||
globals.debug = atoi(val);
|
||||
} else if (!strcmp(var, "sample_rate")) {
|
||||
} else if (!strcmp(var, "sample-rate")) {
|
||||
globals.sample_rate = atoi(val);
|
||||
} else if (!strcmp(var, "dialplan")) {
|
||||
set_global_dialplan(val);
|
||||
} else if (!strcmp(var, "cid_name")) {
|
||||
} else if (!strcmp(var, "cid-name")) {
|
||||
set_global_cid_name(val);
|
||||
} else if (!strcmp(var, "cid_num")) {
|
||||
} else if (!strcmp(var, "cid-num")) {
|
||||
set_global_cid_num(val);
|
||||
} else if (!strcmp(var, "indev")) {
|
||||
if (*val == '#') {
|
||||
|
||||
@@ -1309,11 +1309,11 @@ static switch_status_t config_wanpipe(int reload)
|
||||
globals.debug = atoi(val);
|
||||
} else if (!strcmp(var, "mtu")) {
|
||||
globals.mtu = atoi(val);
|
||||
} else if (!strcmp(var, "dtmf_on")) {
|
||||
} else if (!strcmp(var, "dtmf-on")) {
|
||||
globals.dtmf_on = atoi(val);
|
||||
} else if (!strcmp(var, "dtmf_off")) {
|
||||
} else if (!strcmp(var, "dtmf-off")) {
|
||||
globals.dtmf_off = atoi(val);
|
||||
} else if (!strcmp(var, "supress_dtmf_tone")) {
|
||||
} else if (!strcmp(var, "supress-dtmf-tone")) {
|
||||
globals.supress_dtmf_tone = switch_true(val);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
|
||||
if (!strcmp(var, "jid")) {
|
||||
set_global_jid(val);
|
||||
count++;
|
||||
} else if (!strcmp(var, "target_jid")) {
|
||||
} else if (!strcmp(var, "target-jid")) {
|
||||
set_global_target_jid(val);
|
||||
count++;
|
||||
} else if (!strcmp(var, "passwd")) {
|
||||
|
||||
@@ -149,11 +149,11 @@ static switch_status_t do_config(void)
|
||||
char *var = (char *) switch_xml_attr(param, "name");
|
||||
char *val = (char *) switch_xml_attr(param, "value");
|
||||
|
||||
if (!strcasecmp(var, "gateway_url")) {
|
||||
if (!strcasecmp(var, "gateway-url")) {
|
||||
char *bindings = (char *) switch_xml_attr(param, "bindings");
|
||||
set_global_bindings(bindings);
|
||||
set_global_url(val);
|
||||
} else if (!strcasecmp(var, "http_port")) {
|
||||
} else if (!strcasecmp(var, "http-port")) {
|
||||
globals.port = (uint16_t)atoi(val);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user