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

more nat cleanup 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15759 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-12-02 18:46:17 +00:00
parent c27a26e30e
commit f8da7ac30e
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -1943,7 +1943,8 @@ static switch_status_t cmd_status(char **argv, int argc, switch_stream_handle_t
if (strcasecmp(argv[1], profile->name)) { if (strcasecmp(argv[1], profile->name)) {
stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name));
} }
stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname)); stream->write_function(stream, "Auto-NAT \t%s\n", sofia_test_pflag(profile, PFLAG_AUTO_NAT) ? "true" : "false");
stream->write_function(stream, "DBName \t%s\n", profile->dbname ? profile->dbname : switch_str_nil(profile->odbc_dsn));
stream->write_function(stream, "Pres Hosts \t%s\n", switch_str_nil(profile->presence_hosts)); stream->write_function(stream, "Pres Hosts \t%s\n", switch_str_nil(profile->presence_hosts));
stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan)); stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan));
stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context)); stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context));
@ -2172,7 +2173,8 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
if (strcasecmp(argv[1], profile->name)) { if (strcasecmp(argv[1], profile->name)) {
stream->write_function(stream, " <alias-of>%s</alias-of>\n", switch_str_nil(profile->name)); stream->write_function(stream, " <alias-of>%s</alias-of>\n", switch_str_nil(profile->name));
} }
stream->write_function(stream, " <db-name>%s</db-name>\n", switch_str_nil(profile->dbname)); stream->write_function(stream, " <auto-nat>%s</auto-nat>\n", sofia_test_pflag(profile, PFLAG_AUTO_NAT) ? "true" : "false");
stream->write_function(stream, " <db-name>%s</db-name>\n", profile->dbname ? profile->dbname : switch_str_nil(profile->odbc_dsn));
stream->write_function(stream, " <pres-hosts>%s</pres-hosts>\n", switch_str_nil(profile->presence_hosts)); stream->write_function(stream, " <pres-hosts>%s</pres-hosts>\n", switch_str_nil(profile->presence_hosts));
stream->write_function(stream, " <dialplan>%s</dialplan>\n", switch_str_nil(profile->dialplan)); stream->write_function(stream, " <dialplan>%s</dialplan>\n", switch_str_nil(profile->dialplan));
stream->write_function(stream, " <context>%s</context>\n", switch_str_nil(profile->context)); stream->write_function(stream, " <context>%s</context>\n", switch_str_nil(profile->context));

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

@ -3025,7 +3025,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
if (!profile->sipdomain) { if (!profile->sipdomain) {
profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip);
} }
if (profile->extsipip && sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->extsipip) {
char *ipv6 = strchr(profile->extsipip, ':'); char *ipv6 = strchr(profile->extsipip, ':');
profile->public_url = switch_core_sprintf(profile->pool, profile->public_url = switch_core_sprintf(profile->pool,
"sip:%s@%s%s%s:%d", "sip:%s@%s%s%s:%d",
@ -3036,7 +3036,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
profile->sip_port); profile->sip_port);
} }
if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->extsipip) {
char *ipv6 = strchr(profile->extsipip, ':'); char *ipv6 = strchr(profile->extsipip, ':');
profile->url = switch_core_sprintf(profile->pool, profile->url = switch_core_sprintf(profile->pool,
"sip:%s@%s%s%s:%d", "sip:%s@%s%s%s:%d",
@ -3060,7 +3060,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url); profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url);
if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->public_url) {
profile->tcp_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->public_url); profile->tcp_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->public_url);
} }
@ -3077,7 +3077,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
profile->tls_sip_port = (switch_port_t)atoi(SOFIA_DEFAULT_TLS_PORT); profile->tls_sip_port = (switch_port_t)atoi(SOFIA_DEFAULT_TLS_PORT);
} }
if (profile->extsipip && sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->extsipip) {
char *ipv6 = strchr(profile->extsipip, ':'); char *ipv6 = strchr(profile->extsipip, ':');
profile->tls_public_url = switch_core_sprintf(profile->pool, profile->tls_public_url = switch_core_sprintf(profile->pool,
"sip:%s@%s%s%s:%d", "sip:%s@%s%s%s:%d",
@ -3088,7 +3088,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
profile->tls_sip_port); profile->tls_sip_port);
} }
if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->extsipip) {
char *ipv6 = strchr(profile->extsipip, ':'); char *ipv6 = strchr(profile->extsipip, ':');
profile->tls_url = profile->tls_url =
switch_core_sprintf(profile->pool, switch_core_sprintf(profile->pool,
@ -3135,7 +3135,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir); profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir);
} }
profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_url); profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_url);
if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { if (profile->tls_public_url) {
profile->tls_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_public_url); profile->tls_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_public_url);
} }
} }

5
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -933,10 +933,7 @@ char *sofia_glue_strip_uri(const char *str)
int sofia_glue_check_nat(sofia_profile_t *profile, const char *network_ip) int sofia_glue_check_nat(sofia_profile_t *profile, const char *network_ip)
{ {
return (network_ip && return (profile->extsipip && !switch_check_network_list_ip(network_ip, profile->local_network));
profile->local_network &&
sofia_test_pflag(profile, PFLAG_AUTO_NAT) &&
!switch_check_network_list_ip(network_ip, profile->local_network));
} }
int sofia_glue_transport_has_tls(const sofia_transport_t tp) int sofia_glue_transport_has_tls(const sofia_transport_t tp)

2
src/mod/endpoints/mod_sofia/sofia_sla.c
View File

@ -383,7 +383,7 @@ static int sofia_sla_sub_callback(void *pArg, int argc, char **argv, char **colu
} }
} }
if (sofia_test_pflag(helper->profile, PFLAG_AUTO_NAT)) { if (helper->profile->extsipip) {
if (sofia_glue_check_nat(helper->profile, network_ip)) { if (sofia_glue_check_nat(helper->profile, network_ip)) {
fixup = switch_string_replace(helper->payload, helper->profile->sipip, helper->profile->extsipip); fixup = switch_string_replace(helper->payload, helper->profile->sipip, helper->profile->extsipip);
} else { } else {