<!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][15116] </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=15116">15116</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-08 10:07:12 -0500 (Thu, 08 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>actually-support </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>
<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_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-08 14:55:16 UTC (rev 15115)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-08 15:07:12 UTC (rev 15116)
</span><span class="lines">@@ -1294,7 +1294,8 @@
</span><span class="cx"> nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
</span><span class="cx"> SIPTAG_PAYLOAD_STR(message), TAG_END());
</span><del>- } else if (ua && (switch_stristr("polycom", ua) || switch_stristr("FreeSWITCH", ua))) {
</del><ins>+ } else if ((ua && (switch_stristr("polycom", ua) || switch_stristr("FreeSWITCH", ua))) ||
+ switch_stristr("UPDATE", tech_pvt->x_actually_support_remote)) {
</ins><span class="cx"> snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", name, number);
</span><span class="cx"> nua_update(tech_pvt->nh,
</span><span class="cx"> TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)),
</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 (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-08 14:55:16 UTC (rev 15115)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-08 15:07:12 UTC (rev 15116)
</span><span class="lines">@@ -581,8 +581,8 @@
</span><span class="cx"> char *extrtpip;
</span><span class="cx"> char *stun_ip;
</span><span class="cx"> char *route_uri;
</span><del>- char *x_actually_supported_remote;
- char *x_actually_supported_local;
</del><ins>+ char *x_actually_support_remote;
+ char *x_actually_support_local;
</ins><span class="cx"> switch_port_t stun_port;
</span><span class="cx"> uint32_t stun_flags;
</span><span class="cx"> unsigned long rm_rate;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-08 14:55:16 UTC (rev 15115)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-08 15:07:12 UTC (rev 15116)
</span><span class="lines">@@ -3095,6 +3095,12 @@
</span><span class="cx"> switch_channel_clear_flag(channel, CF_REQ_MEDIA);
</span><span class="cx">
</span><span class="cx"> if ((status == 180 || status == 183 || status == 200)) {
</span><ins>+ const char *x_actually_support;
+
+ if ((x_actually_support = sofia_glue_get_unknown_header(sip, "X-Actually-Support"))) {
+ tech_pvt->x_actually_support_remote = switch_core_session_strdup(session, x_actually_support);
+ }
+
</ins><span class="cx"> if (sip->sip_user_agent && sip->sip_user_agent->g_string) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string);
</span><span class="cx"> } else if (sip->sip_server && sip->sip_server->g_string) {
</span><span class="lines">@@ -5491,8 +5497,8 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (!strncasecmp(un->un_name, "History-Info", 12)) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_history_info", un->un_value);
</span><del>- } else if (!strcasecmp(un->un_name, "X-Actually-Supported")) {
- tech_pvt->x_actually_supported_remote = switch_core_session_strdup(session, un->un_value);
</del><ins>+ } else if (!strcasecmp(un->un_name, "X-Actually-Support")) {
+ tech_pvt->x_actually_support_remote = switch_core_session_strdup(session, un->un_value);
</ins><span class="cx"> } else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) {
</span><span class="cx"> if (!switch_strlen_zero(un->un_value)) {
</span><span class="cx"> char new_name[512] = "";
</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 (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-10-08 14:55:16 UTC (rev 15115)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-10-08 15:07:12 UTC (rev 15116)
</span><span class="lines">@@ -496,6 +496,8 @@
</span><span class="cx"> tech_pvt->flags[x] = profile->flags[x];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ tech_pvt->x_actually_support_local = SOFIA_ACTUALLY_SUPPORT;
+
</ins><span class="cx"> tech_pvt->profile = profile;
</span><span class="cx"> profile->inuse++;
</span><span class="cx"> switch_mutex_unlock(profile->flag_mutex);
</span><span class="lines">@@ -1767,7 +1769,7 @@
</span><span class="cx"> TAG_IF(!switch_strlen_zero(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->privacy)),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
</span><del>- SIPTAG_HEADER_STR("X-Actually-Support: UPDATE"),
</del><ins>+ SIPTAG_HEADER_STR("X-Actually-Support: "SOFIA_ACTUALLY_SUPPORT),
</ins><span class="cx"> TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(route_uri), NUTAG_PROXY(route_uri)),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(route), SIPTAG_ROUTE_STR(route)),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>