<!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][15748] </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=15748">15748</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-12-01 19:58:05 -0600 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Well I'll be a son of a monkey's bitch, it was that bug</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15747 => 15748)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-01 23:36:11 UTC (rev 15747)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-02 01:58:05 UTC (rev 15748)
</span><span class="lines">@@ -2148,7 +2148,11 @@
</span><span class="cx"> } else if (!strcasecmp(var, "context")) {
</span><span class="cx"> profile->context = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "local-network-acl")) {
</span><del>- profile->local_network = switch_core_strdup(profile->pool, val);
</del><ins>+ if (!strcasecmp(var, "none")) {
+ profile->local_network = NULL;
+ } else {
+ profile->local_network = switch_core_strdup(profile->pool, val);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "force-register-domain")) {
</span><span class="cx"> profile->reg_domain = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "force-subscription-domain")) {
</span><span class="lines">@@ -2429,6 +2433,19 @@
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_FIRST_REGISTER);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SQL_IN_TRANS);
</span><span class="cx">
</span><ins>+ profile->local_network = "localnet.auto";
+
+ if (switch_core_get_variable("nat_type")) {
+ const char *ip = switch_core_get_variable("nat_public_addr");
+ if (ip) {
+ profile->extrtpip = switch_core_strdup(profile->pool, ip);
+ profile->extsipip = switch_core_strdup(profile->pool, ip);
+ sofia_set_pflag(profile, PFLAG_AUTO_NAT);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "NAT detected setting external ip to %s\n", ip);
+ }
+ }
+
+
</ins><span class="cx"> for (param = switch_xml_child(settings, "param"); param; param = param->next) {
</span><span class="cx"> char *var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="cx"> char *val = (char *) switch_xml_attr_soft(param, "value");
</span><span class="lines">@@ -2579,12 +2596,14 @@
</span><span class="cx"> if (!strcmp(val, "0.0.0.0")) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
</span><span class="cx"> } else if (!strcasecmp(val, "auto-nat")) {
</span><del>- ip = mod_sofia_globals.auto_nat ? switch_core_get_variable("nat_public_addr") : mod_sofia_globals.guess_ip;
</del><ins>+ ip = NULL;
</ins><span class="cx"> } else {
</span><span class="cx"> ip = strcasecmp(val, "auto") ? val : mod_sofia_globals.guess_ip;
</span><ins>+ sofia_clear_pflag(profile, PFLAG_AUTO_NAT);
</ins><span class="cx"> }
</span><del>- sofia_set_pflag(profile, PFLAG_AUTO_NAT);
- profile->extrtpip = switch_core_strdup(profile->pool, ip);
</del><ins>+ if (ip) {
+ profile->extrtpip = switch_core_strdup(profile->pool, ip);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid ext-rtp-ip\n");
</span><span class="cx"> }
</span><span class="lines">@@ -2617,22 +2636,28 @@
</span><span class="cx"> if (!strcasecmp(val, "0.0.0.0")) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip);
</span><span class="cx"> } else if (!strcasecmp(val, "auto-nat")) {
</span><del>- ip = mod_sofia_globals.auto_nat ? switch_core_get_variable("nat_public_addr") : mod_sofia_globals.guess_ip;
</del><ins>+ ip = NULL;
</ins><span class="cx"> } else if (strcasecmp(val, "auto")) {
</span><span class="cx"> switch_port_t port = 0;
</span><span class="cx"> if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> ip = myip;
</span><ins>+ sofia_clear_pflag(profile, PFLAG_AUTO_NAT);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- sofia_set_pflag(profile, PFLAG_AUTO_NAT);
- profile->extsipip = switch_core_strdup(profile->pool, ip);
</del><ins>+ if (ip) {
+ profile->extsipip = switch_core_strdup(profile->pool, ip);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid ext-sip-ip\n");
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "local-network-acl")) {
</span><del>- profile->local_network = switch_core_strdup(profile->pool, val);
</del><ins>+ if (!strcasecmp(var, "none")) {
+ profile->local_network = NULL;
+ } else {
+ profile->local_network = switch_core_strdup(profile->pool, val);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "force-register-domain")) {
</span><span class="cx"> profile->reg_domain = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "force-register-db-domain")) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (15747 => 15748)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-12-01 23:36:11 UTC (rev 15747)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-12-02 01:58:05 UTC (rev 15748)
</span><span class="lines">@@ -1363,7 +1363,8 @@
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (is_nat && !sofia_glue_check_nat(profile, network_ip)) {
</del><ins>+ if (is_nat && profile->local_network && switch_check_network_list_ip(network_ip, profile->local_network)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s is on local network, not seting NAT mode.\n", network_ip);
</ins><span class="cx"> is_nat = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>