<!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][15474] </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=15474">15474</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-14 20:16:10 -0600 (Sat, 14 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>caller/ee id cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_utilsh">freeswitch/trunk/src/include/switch_utils.h</a></li>
<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="freeswitchtrunksrcincludeswitch_utilsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_utils.h (15473 => 15474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_utils.h 2009-11-14 21:59:01 UTC (rev 15473)
+++ freeswitch/trunk/src/include/switch_utils.h 2009-11-15 02:16:10 UTC (rev 15474)
</span><span class="lines">@@ -308,6 +308,26 @@
</span><span class="cx">
</span><span class="cx"> #define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst))
</span><span class="cx">
</span><ins>+
+static inline char *switch_sanitize_number(char *number)
+{
+ char *p = number, *q;
+ char warp[] = "/:";
+ int i;
+
+ if (!(strchr(p, '/') || strchr(p, ':') || strchr(p, '@'))) {
+ return number;
+ }
+
+ while((q = strrchr(p, '@'))) *q = '\0';
+
+ for(i = 0; i < strlen(warp); i++) {
+ while(p && (q = strchr(p, warp[i]))) p = q + 1;
+ }
+
+ return p;
+}
+
</ins><span class="cx"> static inline switch_bool_t switch_string_var_check(char *s, switch_bool_t disable)
</span><span class="cx"> {
</span><span class="cx"> char *p;
</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 (15473 => 15474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-14 21:59:01 UTC (rev 15473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-15 02:16:10 UTC (rev 15474)
</span><span class="lines">@@ -179,15 +179,15 @@
</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><del>- const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent");
- char *pai = NULL;
</del><ins>+ const char *header, *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent");
+ char *pai = NULL, *tmp = NULL;
</ins><span class="cx">
</span><span class="cx"> if (zstr((callee_name = switch_channel_get_variable(tech_pvt->channel, "effective_callee_id_name"))) &&
</span><span class="cx"> zstr((callee_name = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_name")))) {
</span><span class="cx"> callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name");
</span><span class="cx"> }
</span><del>-
- if (zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "origination_callee_id_number"))) &&
</del><ins>+
+ if (zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "effective_callee_id_number"))) &&
</ins><span class="cx"> zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_number")))) {
</span><span class="cx"> callee_number = tech_pvt->caller_profile->destination_number;
</span><span class="cx"> }
</span><span class="lines">@@ -196,20 +196,30 @@
</span><span class="cx"> callee_name = callee_number;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ tmp = switch_core_session_strdup(session, callee_number);
+ callee_number = switch_sanitize_number(tmp);
+
+ tmp = switch_core_session_strdup(session, callee_name);
+ callee_name = switch_sanitize_number(tmp);
+
</ins><span class="cx"> if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("polycom", ua))) {
</span><span class="cx"> callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, tech_pvt->profile->sipip);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ header = (tech_pvt->cid_type == CID_TYPE_RPID) ? "Remote-Party-ID" : "P-Asserted-Identity";
</ins><span class="cx">
</span><span class="cx"> if (!zstr(callee_name) && !zstr(callee_number)) {
</span><span class="cx"> if (switch_stristr("update_display", tech_pvt->x_freeswitch_support_remote)) {
</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>+ pai = switch_core_session_sprintf(tech_pvt->session, "%s: \"%s\" <%s>\n"
+ "X-FS-Display-Name: %s\nX-FS-Display-Number: %s\n",
+ header, callee_name, callee_number, callee_name, callee_number);
</ins><span class="cx"> } else {
</span><del>- pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\n",
- callee_name, callee_number);
</del><ins>+ pai = switch_core_session_sprintf(tech_pvt->session, "%s: \"%s\" <%s>\n",
+ header, callee_name, callee_number);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return pai;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2859,12 +2869,12 @@
</span><span class="cx"> {
</span><span class="cx"> switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> switch_core_session_t *nsession = NULL;
</span><del>- char *data, *profile_name, *dest, *dest_num = NULL;
</del><ins>+ char *data, *profile_name, *dest;//, *dest_num = NULL;
</ins><span class="cx"> sofia_profile_t *profile = NULL;
</span><span class="cx"> switch_caller_profile_t *caller_profile = NULL;
</span><span class="cx"> private_object_t *tech_pvt = NULL;
</span><span class="cx"> switch_channel_t *nchannel;
</span><del>- char *host = NULL, *dest_to = NULL, *p;
</del><ins>+ char *host = NULL, *dest_to = NULL;
</ins><span class="cx"> const char *hval = NULL;
</span><span class="cx">
</span><span class="cx"> *new_session = NULL;
</span><span class="lines">@@ -3088,7 +3098,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> switch_channel_set_variable(nchannel, "sip_destination_url", tech_pvt->dest);
</span><del>-
</del><ins>+#if 0
</ins><span class="cx"> dest_num = switch_core_session_strdup(nsession, dest);
</span><span class="cx"> if ((p = strchr(dest_num, '@'))) {
</span><span class="cx"> *p = '\0';
</span><span class="lines">@@ -3101,10 +3111,16 @@
</span><span class="cx"> dest_num = p + 5;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif
+
+ caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
</ins><span class="cx">
</span><span class="cx">
</span><del>- caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
- caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest_num);
</del><ins>+ caller_profile->destination_number = switch_sanitize_number(caller_profile->destination_number);
+ caller_profile->caller_id_name = switch_sanitize_number((char *)caller_profile->caller_id_name);
+ caller_profile->caller_id_number = switch_sanitize_number((char *)caller_profile->caller_id_number);
+
+ //caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest_num);
</ins><span class="cx"> switch_channel_set_caller_profile(nchannel, caller_profile);
</span><span class="cx"> switch_channel_set_flag(nchannel, CF_OUTBOUND);
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
</span><span class="lines">@@ -3157,6 +3173,7 @@
</span><span class="cx"> switch_assert(ctech_pvt != NULL);
</span><span class="cx"> tech_pvt->bte = ctech_pvt->te;
</span><span class="cx"> tech_pvt->bcng_pt = ctech_pvt->cng_pt;
</span><ins>+ tech_pvt->cid_type = ctech_pvt->cid_type;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(o_channel, CF_PROXY_MEDIA)) {
</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 (15473 => 15474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-14 21:59:01 UTC (rev 15473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-15 02:16:10 UTC (rev 15474)
</span><span class="lines">@@ -645,6 +645,7 @@
</span><span class="cx"> switch_codec_implementation_t write_impl;
</span><span class="cx"> char *user_via;
</span><span class="cx"> char *redirected;
</span><ins>+ sofia_cid_type_t cid_type;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct callback_t {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15473 => 15474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-14 21:59:01 UTC (rev 15473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-15 02:16:10 UTC (rev 15474)
</span><span class="lines">@@ -501,6 +501,9 @@
</span><span class="cx"> caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, name);
</span><span class="cx"> caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, number);
</span><span class="cx">
</span><ins>+ caller_profile->callee_id_name = switch_sanitize_number((char *)caller_profile->callee_id_name);
+ caller_profile->callee_id_number = switch_sanitize_number((char *)caller_profile->callee_id_number);
+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Update Callee ID to \"%s\" <%s>\n", name, number);
</span><span class="cx">
</span><span class="cx"> if (send) {
</span><span class="lines">@@ -5324,6 +5327,7 @@
</span><span class="cx"> displayname = rpid->rpid_display;
</span><span class="cx"> }
</span><span class="cx"> switch_channel_set_variable(channel, "sip_cid_type", "rpid");
</span><ins>+ tech_pvt->cid_type = CID_TYPE_RPID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((passerted = sip_p_asserted_identity(sip))) {
</span><span class="lines">@@ -5338,6 +5342,7 @@
</span><span class="cx"> displayname = passerted->paid_display;
</span><span class="cx"> }
</span><span class="cx"> switch_channel_set_variable(channel, "sip_cid_type", "pid");
</span><ins>+ tech_pvt->cid_type = CID_TYPE_PID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((ppreferred = sip_p_preferred_identity(sip))) {
</span><span class="lines">@@ -5353,6 +5358,7 @@
</span><span class="cx"> displayname = ppreferred->ppid_display;
</span><span class="cx"> }
</span><span class="cx"> switch_channel_set_variable(channel, "sip_cid_type", "pid");
</span><ins>+ tech_pvt->cid_type = CID_TYPE_PID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (from_user) {
</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 (15473 => 15474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-14 21:59:01 UTC (rev 15473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-15 02:16:10 UTC (rev 15474)
</span><span class="lines">@@ -1632,7 +1632,10 @@
</span><span class="cx">
</span><span class="cx"> if ((val = switch_channel_get_variable(channel, "sip_cid_type"))) {
</span><span class="cx"> cid_type = sofia_cid_name2type(val);
</span><ins>+ } else {
+ cid_type = tech_pvt->cid_type;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> switch (cid_type) {
</span><span class="cx"> case CID_TYPE_PID:
</span><span class="cx"> if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>