<!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][14263] </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=14263">14263</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-15 19:46:35 -0500 (Wed, 15 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>sort out proxy stuff <a href="http://jira.freeswitch.org/browse/SFSIP-165">SFSIP-165</a></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_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<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_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-07-15 22:20:13 UTC (rev 14262)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-07-16 00:46:35 UTC (rev 14263)
</span><span class="lines">@@ -2659,10 +2659,14 @@
</span><span class="cx">
</span><span class="cx"> gateway_ptr->ob_calls++;
</span><span class="cx">
</span><del>- if (!switch_strlen_zero(gateway_ptr->from_domain)) {
</del><ins>+ if (!switch_strlen_zero(gateway_ptr->from_domain) && !switch_channel_get_variable(nchannel, "sip_invite_domain")) {
</ins><span class="cx"> switch_channel_set_variable(nchannel, "sip_invite_domain", gateway_ptr->from_domain);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!switch_strlen_zero(gateway_ptr->outbound_sticky_proxy) && !switch_channel_get_variable(nchannel, "sip_route_uri")) {
+ switch_channel_set_variable(nchannel, "sip_route_uri", gateway_ptr->outbound_sticky_proxy);
+ }
+
</ins><span class="cx"> if (gateway_ptr->ob_vars) {
</span><span class="cx"> switch_event_header_t *hp;
</span><span class="cx"> for(hp = gateway_ptr->ob_vars->headers; hp; hp = hp->next) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-07-15 22:20:13 UTC (rev 14262)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-07-16 00:46:35 UTC (rev 14263)
</span><span class="lines">@@ -353,6 +353,7 @@
</span><span class="cx"> char *register_to;
</span><span class="cx"> char *register_proxy;
</span><span class="cx"> char *register_sticky_proxy;
</span><ins>+ char *outbound_sticky_proxy;
</ins><span class="cx"> char *register_context;
</span><span class="cx"> char *expires_str;
</span><span class="cx"> char *register_url;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-07-15 22:20:13 UTC (rev 14262)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-07-16 00:46:35 UTC (rev 14263)
</span><span class="lines">@@ -1205,7 +1205,7 @@
</span><span class="cx"> *context = profile->context,
</span><span class="cx"> *expire_seconds = "3600",
</span><span class="cx"> *retry_seconds = "30",
</span><del>- *from_user = "", *from_domain = "", *register_proxy = NULL, *contact_host = NULL,
</del><ins>+ *from_user = "", *from_domain = "", *outbound_proxy = NULL, *register_proxy = NULL, *contact_host = NULL,
</ins><span class="cx"> *contact_params = NULL, *params = NULL, *register_transport = NULL;
</span><span class="cx">
</span><span class="cx"> if (!context) {
</span><span class="lines">@@ -1313,6 +1313,8 @@
</span><span class="cx"> contact_host = val;
</span><span class="cx"> } else if (!strcmp(var, "register-proxy")) {
</span><span class="cx"> register_proxy = val;
</span><ins>+ } else if (!strcmp(var, "outbound-proxy")) {
+ outbound_proxy = val;
</ins><span class="cx"> } else if (!strcmp(var, "contact-params")) {
</span><span class="cx"> contact_params = val;
</span><span class="cx"> } else if (!strcmp(var, "register-transport")) {
</span><span class="lines">@@ -1385,28 +1387,41 @@
</span><span class="cx">
</span><span class="cx"> if (!switch_strlen_zero(register_proxy)) {
</span><span class="cx"> if (strncasecmp(register_proxy, "sip:", 4) && strncasecmp(register_proxy, "sips:", 5)) {
</span><del>- gateway->register_sticky_proxy = switch_core_sprintf(gateway->pool, "sip:%s", register_proxy);
</del><ins>+ gateway->outbound_sticky_proxy = switch_core_sprintf(gateway->pool, "sip:%s", register_proxy);
</ins><span class="cx"> } else {
</span><del>- gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy);
</del><ins>+ gateway->outbound_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!switch_strlen_zero(outbound_proxy)) {
+ if (strncasecmp(outbound_proxy, "sip:", 4) && strncasecmp(outbound_proxy, "sips:", 5)) {
+ gateway->register_sticky_proxy = switch_core_sprintf(gateway->pool, "sip:%s", outbound_proxy);
+ } else {
+ gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, outbound_proxy);
+ }
+ }
+
</ins><span class="cx"> gateway->retry_seconds = atoi(retry_seconds);
</span><ins>+
</ins><span class="cx"> if (gateway->retry_seconds < 5) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid retry-seconds of %d on gateway %s, using the value of 30 instead.\n",
</span><span class="cx"> gateway->retry_seconds, name);
</span><span class="cx"> gateway->retry_seconds = 30;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> gateway->register_scheme = switch_core_strdup(gateway->pool, scheme);
</span><span class="cx"> gateway->register_context = switch_core_strdup(gateway->pool, context);
</span><span class="cx"> gateway->register_realm = switch_core_strdup(gateway->pool, realm);
</span><span class="cx"> gateway->register_username = switch_core_strdup(gateway->pool, username);
</span><span class="cx"> gateway->auth_username = switch_core_strdup(gateway->pool, auth_username);
</span><span class="cx"> gateway->register_password = switch_core_strdup(gateway->pool, password);
</span><ins>+
</ins><span class="cx"> if (switch_true(caller_id_in_from)) {
</span><span class="cx"> sofia_set_flag(gateway, REG_FLAG_CALLERID);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> register_transport = (char *) sofia_glue_transport2str(gateway->register_transport);
</span><ins>+
</ins><span class="cx"> if (contact_params) {
</span><span class="cx"> if (*contact_params == ';') {
</span><span class="cx"> params = switch_core_sprintf(gateway->pool, "%s;transport=%s", contact_params, register_transport);
</span><span class="lines">@@ -1421,10 +1436,11 @@
</span><span class="cx"> gateway->from_domain = switch_core_strdup(gateway->pool, from_domain);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", from_domain ? from_domain : register_proxy ? register_proxy : proxy);
</del><ins>+ gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
</ins><span class="cx"> gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport);
</span><span class="cx">
</span><span class="cx"> sipip = contact_host ? contact_host : profile->extsipip ? profile->extsipip : profile->sipip;
</span><ins>+
</ins><span class="cx"> if (extension_in_contact) {
</span><span class="cx"> format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>";
</span><span class="cx"> gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
</span><span class="lines">@@ -1438,15 +1454,15 @@
</span><span class="cx"> sofia_glue_transport_has_tls(gateway->register_transport) ?
</span><span class="cx"> profile->tls_sip_port : profile->sip_port, params);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> gateway->extension = switch_core_strdup(gateway->pool, extension);
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (!strncasecmp(proxy, "sip:", 4)) {
</span><span class="cx"> gateway->register_proxy = switch_core_strdup(gateway->pool, proxy);
</span><del>- gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, from_domain);
</del><ins>+ gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4);
</ins><span class="cx"> } else {
</span><span class="cx"> gateway->register_proxy = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
</span><del>- gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, from_domain);
</del><ins>+ gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gateway->expires_str = switch_core_strdup(gateway->pool, expire_seconds);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>