<!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][15172] </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=15172">15172</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-16 14:51:32 -0500 (Fri, 16 Oct 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>set gateway name in params too</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 (15171 => 15172)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c        2009-10-16 19:09:11 UTC (rev 15171)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c        2009-10-16 19:51:32 UTC (rev 15172)
</span><span class="lines">@@ -1600,12 +1600,12 @@
</span><span class="cx"> 
</span><span class="cx">                         if (contact_params) {
</span><span class="cx">                                 if (*contact_params == ';') {
</span><del>-                                        params = switch_core_sprintf(gateway-&gt;pool, &quot;%s;transport=%s&quot;, contact_params, register_transport);
</del><ins>+                                        params = switch_core_sprintf(gateway-&gt;pool, &quot;%s;transport=%s;gw=%s&quot;, contact_params, register_transport, gateway-&gt;name);
</ins><span class="cx">                                 } else {
</span><del>-                                        params = switch_core_sprintf(gateway-&gt;pool, &quot;;%s;transport=%s&quot;, contact_params, register_transport);
</del><ins>+                                        params = switch_core_sprintf(gateway-&gt;pool, &quot;;%s;transport=%s;gw=%s&quot;, contact_params, register_transport, gateway-&gt;name);
</ins><span class="cx">                                 }
</span><span class="cx">                         } else {
</span><del>-                                params = switch_core_sprintf(gateway-&gt;pool, &quot;;transport=%s&quot;, register_transport);
</del><ins>+                                params = switch_core_sprintf(gateway-&gt;pool, &quot;;transport=%s;gw=%s&quot;, register_transport, gateway-&gt;name);
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                         if (!switch_strlen_zero(from_domain)) {
</span><span class="lines">@@ -4823,6 +4823,7 @@
</span><span class="cx">         char *is_nat = NULL;
</span><span class="cx">         char acl_token[512] = &quot;&quot;;
</span><span class="cx">         sofia_transport_t transport;
</span><ins>+        const char *gw_name = NULL;
</ins><span class="cx"> 
</span><span class="cx">         profile-&gt;ib_calls++;
</span><span class="cx"> 
</span><span class="lines">@@ -5390,9 +5391,16 @@
</span><span class="cx">                 free(tmp);
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        
+        if (sip-&gt;sip_request-&gt;rq_url-&gt;url_params) {
+                gw_name = sofia_glue_find_parameter(sip-&gt;sip_request-&gt;rq_url-&gt;url_params, &quot;gw=&quot;);
+        }
</ins><span class="cx"> 
</span><span class="cx">         if (strstr(destination_number, &quot;gw+&quot;)) {
</span><del>-                const char *gw_name = destination_number + 3;
</del><ins>+                gw_name = destination_number + 3;
+        }
+
+        if (gw_name) {
</ins><span class="cx">                 sofia_gateway_t *gateway;
</span><span class="cx">                 if (gw_name &amp;&amp; (gateway = sofia_reg_find_gateway(gw_name))) {
</span><span class="cx">                         context = switch_core_session_strdup(session, gateway-&gt;register_context);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>