<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15759] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15759">15759</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-02 12:46:17 -0600 (Wed, 02 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>more nat cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_slac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15758 => 15759)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-02 18:19:14 UTC (rev 15758)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-02 18:46:17 UTC (rev 15759)
</span><span class="lines">@@ -1943,7 +1943,8 @@
</span><span class="cx"> if (strcasecmp(argv[1], profile->name)) {
</span><span class="cx"> stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name));
</span><span class="cx"> }
</span><del>- stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname));
</del><ins>+ 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));
</ins><span class="cx"> stream->write_function(stream, "Pres Hosts \t%s\n", switch_str_nil(profile->presence_hosts));
</span><span class="cx"> stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan));
</span><span class="cx"> stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context));
</span><span class="lines">@@ -2172,7 +2173,8 @@
</span><span class="cx"> if (strcasecmp(argv[1], profile->name)) {
</span><span class="cx"> stream->write_function(stream, " <alias-of>%s</alias-of>\n", switch_str_nil(profile->name));
</span><span class="cx"> }
</span><del>- stream->write_function(stream, " <db-name>%s</db-name>\n", switch_str_nil(profile->dbname));
</del><ins>+ 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));
</ins><span class="cx"> stream->write_function(stream, " <pres-hosts>%s</pres-hosts>\n", switch_str_nil(profile->presence_hosts));
</span><span class="cx"> stream->write_function(stream, " <dialplan>%s</dialplan>\n", switch_str_nil(profile->dialplan));
</span><span class="cx"> stream->write_function(stream, " <context>%s</context>\n", switch_str_nil(profile->context));
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15758 => 15759)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-02 18:19:14 UTC (rev 15758)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-02 18:46:17 UTC (rev 15759)
</span><span class="lines">@@ -3025,7 +3025,7 @@
</span><span class="cx"> if (!profile->sipdomain) {
</span><span class="cx"> profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip);
</span><span class="cx"> }
</span><del>- if (profile->extsipip && sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->extsipip) {
</ins><span class="cx"> char *ipv6 = strchr(profile->extsipip, ':');
</span><span class="cx"> profile->public_url = switch_core_sprintf(profile->pool,
</span><span class="cx"> "sip:%s@%s%s%s:%d",
</span><span class="lines">@@ -3036,7 +3036,7 @@
</span><span class="cx"> profile->sip_port);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->extsipip) {
</ins><span class="cx"> char *ipv6 = strchr(profile->extsipip, ':');
</span><span class="cx"> profile->url = switch_core_sprintf(profile->pool,
</span><span class="cx"> "sip:%s@%s%s%s:%d",
</span><span class="lines">@@ -3060,7 +3060,7 @@
</span><span class="cx">
</span><span class="cx"> profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url);
</span><span class="cx">
</span><del>- if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->public_url) {
</ins><span class="cx"> profile->tcp_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->public_url);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3077,7 +3077,7 @@
</span><span class="cx"> profile->tls_sip_port = (switch_port_t)atoi(SOFIA_DEFAULT_TLS_PORT);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (profile->extsipip && sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->extsipip) {
</ins><span class="cx"> char *ipv6 = strchr(profile->extsipip, ':');
</span><span class="cx"> profile->tls_public_url = switch_core_sprintf(profile->pool,
</span><span class="cx"> "sip:%s@%s%s%s:%d",
</span><span class="lines">@@ -3088,7 +3088,7 @@
</span><span class="cx"> profile->tls_sip_port);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->extsipip) {
</ins><span class="cx"> char *ipv6 = strchr(profile->extsipip, ':');
</span><span class="cx"> profile->tls_url =
</span><span class="cx"> switch_core_sprintf(profile->pool,
</span><span class="lines">@@ -3135,7 +3135,7 @@
</span><span class="cx"> profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir);
</span><span class="cx"> }
</span><span class="cx"> profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_url);
</span><del>- if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (profile->tls_public_url) {
</ins><span class="cx"> profile->tls_public_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_public_url);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (15758 => 15759)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-02 18:19:14 UTC (rev 15758)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-02 18:46:17 UTC (rev 15759)
</span><span class="lines">@@ -933,10 +933,7 @@
</span><span class="cx">
</span><span class="cx"> int sofia_glue_check_nat(sofia_profile_t *profile, const char *network_ip)
</span><span class="cx"> {
</span><del>- return (network_ip &&
- profile->local_network &&
- sofia_test_pflag(profile, PFLAG_AUTO_NAT) &&
- !switch_check_network_list_ip(network_ip, profile->local_network));
</del><ins>+ return (profile->extsipip && !switch_check_network_list_ip(network_ip, profile->local_network));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int sofia_glue_transport_has_tls(const sofia_transport_t tp)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_slac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (15758 => 15759)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 2009-12-02 18:19:14 UTC (rev 15758)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 2009-12-02 18:46:17 UTC (rev 15759)
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sofia_test_pflag(helper->profile, PFLAG_AUTO_NAT)) {
</del><ins>+ if (helper->profile->extsipip) {
</ins><span class="cx"> if (sofia_glue_check_nat(helper->profile, network_ip)) {
</span><span class="cx"> fixup = switch_string_replace(helper->payload, helper->profile->sipip, helper->profile->extsipip);
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>