<!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][16473] </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=16473">16473</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-01-22 17:37:50 -0600 (Fri, 22 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> fix rpid and from correctly when auto-nat is enabled so polycom won't display the flipping URI and freak some poor souls out :P </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16472 => 16473)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-22 22:17:17 UTC (rev 16472)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-22 23:37:50 UTC (rev 16473)
</span><span class="lines">@@ -1468,7 +1468,7 @@
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_READY);
</span><span class="cx">
</span><span class="cx"> if (!tech_pvt->nh) {
</span><del>- char *d_url = NULL, *url = NULL, *dest_host = NULL, *url_str = NULL;
</del><ins>+ char *d_url = NULL, *url = NULL, *url_str = NULL;
</ins><span class="cx"> sofia_private_t *sofia_private;
</span><span class="cx"> char *invite_contact = NULL, *to_str, *use_from_str, *from_str;
</span><span class="cx"> const char *t_var;
</span><span class="lines">@@ -1497,11 +1497,6 @@
</span><span class="cx">
</span><span class="cx"> url_str = url;
</span><span class="cx">
</span><del>- if ((dest_host = strchr(url_str, '@'))) {
- dest_host++;
- }
-
-
</del><span class="cx"> if (!tech_pvt->from_str) {
</span><span class="cx"> const char* sipip;
</span><span class="cx"> const char* format;
</span><span class="lines">@@ -1509,7 +1504,7 @@
</span><span class="cx">
</span><span class="cx"> sipip = tech_pvt->profile->sipip;
</span><span class="cx">
</span><del>- if (sofia_glue_check_nat(tech_pvt->profile, dest_host)) {
</del><ins>+ if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
</ins><span class="cx"> sipip = tech_pvt->profile->extsipip;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1527,7 +1522,6 @@
</span><span class="cx"> !zstr(cid_num) ? "@" : "",
</span><span class="cx"> sipip);
</span><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><span class="cx"> if (from_var) {
</span><span class="cx"> if (strncasecmp(from_var, "sip:", 4) || strncasecmp(from_var, "sips:", 5)) {
</span><span class="lines">@@ -1559,6 +1553,14 @@
</span><span class="cx"> rpid_domain = "cluecon.com";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTO_NAT)) {
+ if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
+ rpid_domain = tech_pvt->profile->extsipip;
+ } else {
+ rpid_domain = tech_pvt->profile->sipip;
+ }
+ }
+
</ins><span class="cx"> /*
</span><span class="cx"> * Ignore transport chanvar and uri parameter for gateway connections
</span><span class="cx"> * since all of them have been already taken care of in mod_sofia.c:sofia_outgoing_channel()
</span><span class="lines">@@ -1592,7 +1594,7 @@
</span><span class="cx"> if ((contact = switch_channel_get_variable(channel, "sip_contact_user"))) {
</span><span class="cx"> char *ip_addr;
</span><span class="cx"> char *ipv6;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) {
</span><span class="cx"> ip_addr = (switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network))
</span><span class="cx"> ? tech_pvt->profile->sipip : tech_pvt->profile->extsipip;
</span><span class="lines">@@ -1628,7 +1630,6 @@
</span><span class="cx"> from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params);
</span><span class="cx"> to_str = sofia_overcome_sip_uri_weakness(session, invite_to_uri ? invite_to_uri : tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params);
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*
</span><span class="cx"> Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,
</span><span class="cx"> or did he just suggest it to make our lives miserable?
</span><span class="lines">@@ -1646,7 +1647,7 @@
</span><span class="cx"> call_id = switch_core_session_get_uuid(session);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL,
</span><span class="cx"> NUTAG_URL(url_str),
</span><span class="cx"> TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>