<!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][17054] </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=17054">17054</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-19 18:40:30 -0500 (Fri, 19 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add display feature to SCA</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (17053 => 17054)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-03-19 23:23:04 UTC (rev 17053)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2010-03-19 23:40:30 UTC (rev 17054)
</span><span class="lines">@@ -1515,11 +1515,14 @@
</span><span class="cx"> {
</span><span class="cx"> struct state_helper *sh = (struct state_helper *) pArg;
</span><span class="cx"> char key[256] = "";
</span><ins>+ switch_core_session_t *session;
+ const char *callee_name = NULL, *callee_number = NULL;
</ins><span class="cx"> char *data = NULL, *tmp;
</span><span class="cx"> char *user = argv[0];
</span><span class="cx"> char *host = argv[1];
</span><span class="cx"> char *info = argv[2];
</span><span class="cx"> char *state = argv[3];
</span><ins>+ char *uuid = argv[4];
</ins><span class="cx"> int i;
</span><span class="cx">
</span><span class="cx"> if (mod_sofia_globals.debug_sla > 1) {
</span><span class="lines">@@ -1540,10 +1543,53 @@
</span><span class="cx">
</span><span class="cx"> data = switch_core_hash_find(sh->hash, key);
</span><span class="cx">
</span><del>- if (data) {
- tmp = switch_core_sprintf(sh->pool, "%s,<sip:%s>;%s;appearance-state=%s", data, host, info, state);
</del><ins>+ if (uuid && (session = switch_core_session_locate(uuid))) {
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+
+ if (zstr((callee_name = switch_channel_get_variable(channel, "effective_callee_id_name"))) &&
+ zstr((callee_name = switch_channel_get_variable(channel, "sip_callee_id_name")))) {
+ callee_name = switch_channel_get_variable(channel, "callee_id_name");
+ }
+
+ if (zstr((callee_number = switch_channel_get_variable(channel, "effective_callee_id_number"))) &&
+ zstr((callee_number = switch_channel_get_variable(channel, "sip_callee_id_number")))) {
+ callee_number = switch_channel_get_variable(channel, "destination_number");
+ }
+
+ if (zstr(callee_name) && !zstr(callee_number)) {
+ callee_name = callee_number;
+ }
+
+ if (!zstr(callee_number)) {
+ callee_number = switch_sanitize_number(switch_core_session_strdup(session, callee_number));
+ }
+
+ if (!zstr(callee_name)) {
+ callee_name = switch_sanitize_number(switch_core_session_strdup(session, callee_name));
+ }
+ switch_core_session_rwunlock(session);
+ }
+
+ if (!zstr(callee_number)) {
+ if (zstr(callee_name)) {
+ callee_name = "unknown";
+ }
+
+ if (data) {
+ tmp = switch_core_sprintf(sh->pool,
+ "%s,<sip:%s>;%s;appearance-state=%s;appearance-uri=\"\\\"%s\\\" <sip:%s@%s>\"",
+ data, host, info, state, callee_name, callee_number, host);
+ } else {
+ tmp = switch_core_sprintf(sh->pool,
+ "<sip:%s>;%s;appearance-state=%s;appearance-uri=\"\\\"%s\\\" <sip:%s@%s>\"",
+ host, info, state, callee_name, callee_number, host);
+ }
</ins><span class="cx"> } else {
</span><del>- tmp = switch_core_sprintf(sh->pool, "<sip:%s>;%s;appearance-state=%s", host, info, state);
</del><ins>+ if (data) {
+ tmp = switch_core_sprintf(sh->pool, "%s,<sip:%s>;%s;appearance-state=%s", data, host, info, state);
+ } else {
+ tmp = switch_core_sprintf(sh->pool, "<sip:%s>;%s;appearance-state=%s", host, info, state);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_hash_insert(sh->hash, key, tmp);
</span><span class="lines">@@ -1562,7 +1608,7 @@
</span><span class="cx"> sh->pool = pool;
</span><span class="cx"> switch_core_hash_init(&sh->hash, sh->pool);
</span><span class="cx">
</span><del>- sql = switch_mprintf("select sip_from_user,sip_from_host,call_info,call_info_state from sip_dialogs "
</del><ins>+ sql = switch_mprintf("select sip_from_user,sip_from_host,call_info,call_info_state,uuid from sip_dialogs "
</ins><span class="cx"> "where hostname='%q' " "and sip_from_user='%q' and sip_from_host='%q' ", mod_sofia_globals.hostname, to_user, to_host);
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>