<!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][15230] </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=15230">15230</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-26 13:16:38 -0500 (Mon, 26 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add pass-callee-id (defaults to true) disable by setting it to false if you encounter something too stupid to ignore X headers</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 (15229 => 15230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-26 18:06:39 UTC (rev 15229)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-26 18:16:38 UTC (rev 15230)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> {
</span><span class="cx"> private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session);
</span><span class="cx"> const char *callee_name = NULL, *callee_number = NULL;
</span><ins>+ const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent");
</ins><span class="cx"> char *pai = NULL;
</span><span class="cx">
</span><span class="cx"> if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_name"))) {
</span><span class="lines">@@ -195,9 +196,19 @@
</span><span class="cx"> callee_name = callee_number;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (ua && !zstr(callee_number) && !switch_stristr("polycom", ua)) {
+ callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, tech_pvt->profile->sipip);
+ }
+
+
</ins><span class="cx"> if (!zstr(callee_name) && !zstr(callee_number)) {
</span><del>- pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\nX-FS-Display-Name: %s\nX-FS-Display-Number: %s\n",
- callee_name, callee_number, callee_name, callee_number);
</del><ins>+ if (switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote)) {
+ pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\nX-FS-Display-Name: %s\nX-FS-Display-Number: %s\n",
+ callee_name, callee_number, callee_name, callee_number);
+ } else {
+ pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\n",
+ callee_name, callee_number, callee_name, callee_number);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return pai;
</span><span class="cx"> }
</span><span class="lines">@@ -496,7 +507,8 @@
</span><span class="cx"> SOATAG_REUSE_REJECTED(1),
</span><span class="cx"> SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1),
</span><span class="cx"> TAG_IF(!zstr(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
</span><del>- SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT),
</del><ins>+ TAG_IF(switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote),
+ SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT)),
</ins><span class="cx"> TAG_END());
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n");
</span><span class="lines">@@ -586,7 +598,8 @@
</span><span class="cx"> SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
</span><span class="cx"> SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1),
</span><span class="cx"> TAG_IF(!zstr(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
</span><del>- SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT),
</del><ins>+ TAG_IF(switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote),
+ SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT)),
</ins><span class="cx"> TAG_END());
</span><span class="cx"> switch_safe_free(extra_headers);
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_ANS);
</span><span class="lines">@@ -1568,7 +1581,8 @@
</span><span class="cx"> SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
</span><span class="cx"> SIPTAG_HEADER_STR(generate_pai_str(session)),
</span><span class="cx"> TAG_IF(!zstr(extra_header), SIPTAG_HEADER_STR(extra_header)),
</span><del>- SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT),
</del><ins>+ TAG_IF(switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote),
+ SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT)),
</ins><span class="cx"> TAG_END());
</span><span class="cx"> switch_safe_free(extra_header);
</span><span class="cx"> switch_channel_mark_ring_ready(channel);
</span><span class="lines">@@ -1665,7 +1679,8 @@
</span><span class="cx"> SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),
</span><span class="cx"> SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"),
</span><span class="cx"> TAG_IF(!zstr(extra_header), SIPTAG_HEADER_STR(extra_header)),
</span><del>- SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT),
</del><ins>+ TAG_IF(switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote),
+ SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT)),
</ins><span class="cx"> TAG_END());
</span><span class="cx"> switch_safe_free(extra_header);
</span><span class="cx"> }
</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 (15229 => 15230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-26 18:06:39 UTC (rev 15229)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-26 18:16:38 UTC (rev 15230)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> PFLAG_AUTO_NAT,
</span><span class="cx"> PFLAG_SIPCOMPACT,
</span><span class="cx"> PFLAG_SQL_IN_TRANS,
</span><ins>+ PFLAG_PASS_CALLEE_ID,
</ins><span class="cx"> /* No new flags below this line */
</span><span class="cx"> PFLAG_MAX
</span><span class="cx"> } PFLAGS;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15229 => 15230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-26 18:06:39 UTC (rev 15229)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-26 18:16:38 UTC (rev 15230)
</span><span class="lines">@@ -1830,6 +1830,7 @@
</span><span class="cx"> profile->reg_acl_count = 0;
</span><span class="cx"> profile->proxy_acl_count = 0;
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_STUN_ENABLED);
</span><ins>+ sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
</ins><span class="cx"> profile->ib_calls = 0;
</span><span class="cx"> profile->ob_calls = 0;
</span><span class="cx"> profile->ib_failed_calls = 0;
</span><span class="lines">@@ -1847,6 +1848,12 @@
</span><span class="cx"> profile->debug = atoi(val);
</span><span class="cx"> } else if (!strcasecmp(var, "tracelevel")) {
</span><span class="cx"> mod_sofia_globals.tracelevel = switch_log_str2level(val);
</span><ins>+ } else if (!strcasecmp(var, "pass-callee-id")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_PASS_CALLEE_ID);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "sip-trace")) {
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_flag(profile, TFLAG_TPORT_LOG);
</span><span class="lines">@@ -2386,6 +2393,7 @@
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_REGISTER);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE);
</span><span class="cx"> profile->contact_user = SOFIA_DEFAULT_CONTACT_USER;
</span><ins>+ sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
</ins><span class="cx">
</span><span class="cx"> for (param = switch_xml_child(settings, "param"); param; param = param->next) {
</span><span class="cx"> char *var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="lines">@@ -2773,6 +2781,12 @@
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SIPCOMPACT);
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "pass-callee-id")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_PASS_CALLEE_ID);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "sql-in-transactions")) {
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SQL_IN_TRANS);
</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 (15229 => 15230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-10-26 18:06:39 UTC (rev 15229)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-10-26 18:16:38 UTC (rev 15230)
</span><span class="lines">@@ -1773,7 +1773,7 @@
</span><span class="cx"> TAG_IF(!zstr(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->privacy)),
</span><span class="cx"> TAG_IF(!zstr(alert_info), SIPTAG_HEADER_STR(alert_info)),
</span><span class="cx"> TAG_IF(!zstr(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
</span><del>- SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT),
</del><ins>+ TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_PASS_CALLEE_ID), SIPTAG_HEADER_STR("X-FS-Support: "FREESWITCH_SUPPORT)),
</ins><span class="cx"> TAG_IF(!zstr(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
</span><span class="cx"> TAG_IF(!zstr(route_uri), NUTAG_PROXY(route_uri)),
</span><span class="cx"> TAG_IF(!zstr(route), SIPTAG_ROUTE_STR(route)),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>