kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4859 regression

This commit is contained in:
Anthony Minessale 2012-12-10 13:52:25 -06:00
parent c4cf1ba222
commit 7ba3dadcd8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -2481,6 +2481,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
for (via = vias; via; via = via->v_next) { for (via = vias; via; via = via->v_next) {
if (sofia_test_pflag(profile, PFLAG_AUTO_ASSIGN_PORT) && !strcmp(via->v_protocol, "SIP/2.0/UDP")) { if (sofia_test_pflag(profile, PFLAG_AUTO_ASSIGN_PORT) && !strcmp(via->v_protocol, "SIP/2.0/UDP")) {
profile->sip_port = atoi(via->v_port); profile->sip_port = atoi(via->v_port);
if (!profile->extsipport) profile->extsipport = profile->sip_port;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found auto sip port %d for %s\n", profile->sip_port, profile->name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found auto sip port %d for %s\n", profile->sip_port, profile->name);
} }
@ -3922,6 +3923,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
sofia_set_pflag(profile, PFLAG_AUTO_ASSIGN_PORT); sofia_set_pflag(profile, PFLAG_AUTO_ASSIGN_PORT);
} else { } else {
profile->sip_port = (switch_port_t) atoi(val); profile->sip_port = (switch_port_t) atoi(val);
if (!profile->extsipport) profile->extsipport = profile->sip_port;
} }
} else if (!strcasecmp(var, "vad")) { } else if (!strcasecmp(var, "vad")) {
if (!strcasecmp(val, "in")) { if (!strcasecmp(val, "in")) {
@ -4000,10 +4002,6 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
} else if (!strcasecmp(val, "auto-nat")) { } else if (!strcasecmp(val, "auto-nat")) {
ip = NULL; ip = NULL;
} else if (strcasecmp(val, "auto")) { } else if (strcasecmp(val, "auto")) {
if (!profile->extsipport) {
profile->extsipport = profile->sip_port;
}
if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &profile->extsipport, val, profile->pool) == SWITCH_STATUS_SUCCESS) { if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &profile->extsipport, val, profile->pool) == SWITCH_STATUS_SUCCESS) {
ip = myip; ip = myip;
sofia_clear_pflag(profile, PFLAG_AUTO_NAT); sofia_clear_pflag(profile, PFLAG_AUTO_NAT);
@ -4547,6 +4545,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
if (!profile->sip_port && !sofia_test_pflag(profile, PFLAG_AUTO_ASSIGN_PORT)) { if (!profile->sip_port && !sofia_test_pflag(profile, PFLAG_AUTO_ASSIGN_PORT)) {
profile->sip_port = (switch_port_t) atoi(SOFIA_DEFAULT_PORT); profile->sip_port = (switch_port_t) atoi(SOFIA_DEFAULT_PORT);
if (!profile->extsipport) profile->extsipport = profile->sip_port;
} }
if (!profile->dialplan) { if (!profile->dialplan) {
@ -4667,10 +4666,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
} }
if (profile->sipip) { if (profile->sipip) {
if (!profile->extsipport) profile->extsipport = profile->sip_port;
if (!profile->extsipport) {
profile->extsipport = profile->sip_port;
}
launch_sofia_profile_thread(profile); launch_sofia_profile_thread(profile);
if (profile->odbc_dsn) { if (profile->odbc_dsn) {