<!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][16534] </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=16534">16534</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-28 14:35:17 -0600 (Thu, 28 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/SFSIP-197">SFSIP-197</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_sessionc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</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="freeswitchtrunklibssofiasiplibsofiasipuanuanua_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (16533 => 16534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c 2010-01-28 18:46:47 UTC (rev 16533)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c 2010-01-28 20:35:17 UTC (rev 16534)
</span><span class="lines">@@ -3935,7 +3935,7 @@
</span><span class="cx">
</span><span class="cx"> retval = nua_base_server_report(sr, tags);
</span><span class="cx">
</span><del>- assert(2 <= retval && retval < 4);
</del><ins>+ //assert(2 <= retval && retval < 4);
</ins><span class="cx">
</span><span class="cx"> #if 0
</span><span class="cx"> if (ss) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (16533 => 16534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-01-28 18:46:47 UTC (rev 16533)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-01-28 20:35:17 UTC (rev 16534)
</span><span class="lines">@@ -394,7 +394,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_ANSWERED) || sofia_test_flag(tech_pvt, TFLAG_ANS)) {
</span><del>- const char *call_info = switch_channel_get_variable(channel, "presence_call_info");
</del><ins>+ const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
+
</ins><span class="cx"> if (!tech_pvt->got_bye) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye");
</span><span class="cx"> }
</span><span class="lines">@@ -474,7 +475,7 @@
</span><span class="cx"> const char *b_sdp = NULL;
</span><span class="cx"> int is_proxy = 0;
</span><span class="cx"> char *sticky = NULL;
</span><del>- const char *call_info = switch_channel_get_variable(channel, "presence_call_info");
</del><ins>+ const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
</ins><span class="cx">
</span><span class="cx"> if (sofia_test_flag(tech_pvt, TFLAG_ANS) || switch_channel_test_flag(channel, CF_OUTBOUND)) {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -506,7 +507,6 @@
</span><span class="cx"> /* Send the 200 OK */
</span><span class="cx"> if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><span class="cx"> char *extra_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_RESPONSE_HEADER_PREFIX);
</span><del>-
</del><span class="cx"> if (sofia_use_soa(tech_pvt)) {
</span><span class="cx"> nua_respond(tech_pvt->nh, SIP_200_OK,
</span><span class="cx"> SIPTAG_CONTACT_STR(tech_pvt->profile->url),
</span><span class="lines">@@ -611,6 +611,7 @@
</span><span class="cx"> if (sofia_use_soa(tech_pvt)) {
</span><span class="cx"> nua_respond(tech_pvt->nh, SIP_200_OK,
</span><span class="cx"> NUTAG_AUTOANSWER(0),
</span><ins>+ TAG_IF(call_info, SIPTAG_CALL_INFO_STR(call_info)),
</ins><span class="cx"> TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)),
</span><span class="cx"> SIPTAG_HEADER_STR(generate_pai_str(session)),
</span><span class="cx"> NUTAG_SESSION_TIMER(session_timeout),
</span><span class="lines">@@ -626,6 +627,7 @@
</span><span class="cx"> nua_respond(tech_pvt->nh, SIP_200_OK,
</span><span class="cx"> NUTAG_AUTOANSWER(0),
</span><span class="cx"> NUTAG_MEDIA_ENABLE(0),
</span><ins>+ TAG_IF(call_info, SIPTAG_CALL_INFO_STR(call_info)),
</ins><span class="cx"> TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)),
</span><span class="cx"> SIPTAG_HEADER_STR(generate_pai_str(session)),
</span><span class="cx"> NUTAG_SESSION_TIMER(session_timeout),
</span><span class="lines">@@ -1776,7 +1778,7 @@
</span><span class="cx"> if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) &&
</span><span class="cx"> !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
</span><span class="cx"> char *extra_header = sofia_glue_get_extra_headers(channel, SOFIA_SIP_PROGRESS_HEADER_PREFIX);
</span><del>- const char *call_info = switch_channel_get_variable(channel, "presence_call_info");
</del><ins>+ const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
</ins><span class="cx">
</span><span class="cx"> nua_respond(tech_pvt->nh, SIP_180_RINGING,
</span><span class="cx"> SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
</span><span class="lines">@@ -1797,7 +1799,7 @@
</span><span class="cx"> {
</span><span class="cx"> char *sticky = NULL;
</span><span class="cx"> const char *val = NULL;
</span><del>- const char *call_info = switch_channel_get_variable(channel, "presence_call_info");
</del><ins>+ const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
</ins><span class="cx">
</span><span class="cx"> if (sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY) && sofia_test_flag(tech_pvt, TFLAG_3PCC)) {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (16533 => 16534)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-28 18:46:47 UTC (rev 16533)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-28 20:35:17 UTC (rev 16534)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> phrase = "OK";
</span><span class="cx">
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_BYE);
</span><del>- call_info = switch_channel_get_variable(channel, "presence_call_info");
</del><ins>+ call_info = switch_channel_get_variable(channel, "presence_call_info_full");
</ins><span class="cx">
</span><span class="cx"> if (sip->sip_reason && sip->sip_reason->re_protocol &&
</span><span class="cx"> (!strcasecmp(sip->sip_reason->re_protocol, "Q.850")
</span><span class="lines">@@ -3525,8 +3525,11 @@
</span><span class="cx"> if (channel && sip->sip_call_info) {
</span><span class="cx"> char *p;
</span><span class="cx"> call_info = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info);
</span><del>- if ((p = strchr(call_info, ';'))) {
- switch_channel_set_variable(channel, "presence_call_info", p+1);
</del><ins>+ if (!switch_stristr("appearance", call_info)) {
+ switch_channel_set_variable(channel, "presence_call_info_full", call_info);
+ if ((p = strchr(call_info, ';'))) {
+ switch_channel_set_variable(channel, "presence_call_info", p+1);
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else if ((status == 180 || status == 183 || status == 200)) {
</span><span class="cx"> char buf[128] = "";
</span><span class="lines">@@ -5422,8 +5425,11 @@
</span><span class="cx"> if (channel && sip->sip_call_info) {
</span><span class="cx"> char *p;
</span><span class="cx"> if ((call_info = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info))) {
</span><del>- if ((p = strchr(call_info, ';'))) {
- switch_channel_set_variable(channel, "presence_call_info", p+1);
</del><ins>+ if (!switch_stristr("appearance", call_info)) {
+ switch_channel_set_variable(channel, "presence_call_info_full", call_info);
+ if ((p = strchr(call_info, ';'))) {
+ switch_channel_set_variable(channel, "presence_call_info", p+1);
+ }
</ins><span class="cx"> }
</span><span class="cx"> su_free(nua_handle_home(nh), call_info);
</span><span class="cx"> }
</span><span class="lines">@@ -6159,6 +6165,7 @@
</span><span class="cx">
</span><span class="cx"> if ((uuid = switch_channel_get_variable(b_channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
</span><span class="cx"> switch_channel_set_variable(b_channel, "presence_call_info", NULL);
</span><ins>+ switch_channel_set_variable(b_channel, "presence_call_info_full", NULL);
</ins><span class="cx"> one_leg = 0;
</span><span class="cx"> } else {
</span><span class="cx"> uuid = switch_core_session_get_uuid(b_session);
</span><span class="lines">@@ -6353,7 +6360,8 @@
</span><span class="cx"> full_contact = sip_header_as_string(nua_handle_home(tech_pvt->nh), (void *) sip->sip_contact);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (call_info_str) {
</del><ins>+ if (call_info_str && !switch_stristr("appearance", call_info_str)) {
+ switch_channel_set_variable(channel, "presence_call_info_full", call_info_str);
</ins><span class="cx"> if ((p = strchr(call_info_str, ';'))) {
</span><span class="cx"> p++;
</span><span class="cx"> switch_channel_set_variable(channel, "presence_call_info", p);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>