<!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][15420] </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=15420">15420</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-10 20:10:41 -0600 (Tue, 10 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add cols to sip_dialogs</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_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 (15419 => 15420)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-11 01:50:43 UTC (rev 15419)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-11 02:10:41 UTC (rev 15420)
</span><span class="lines">@@ -1167,6 +1167,19 @@
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_ANSWER:
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_PROGRESS:
</span><span class="cx"> {
</span><ins>+ const char *presence_data = switch_channel_get_variable(channel, "presence_data");
+ const char *presence_id = switch_channel_get_variable(channel, "presence_id");
+ char *sql;
+
+ if (presence_id || presence_data) {
+ sql = switch_mprintf("update sip_dialogs set presence_id='%q',presence_data='%q' "
+ "where uuid='%s';\n", switch_str_nil(presence_id), switch_str_nil(presence_data),
+ switch_core_session_get_uuid(session));
+ }
+
+ switch_assert(sql);
+ sofia_glue_execute_sql(tech_pvt->profile, &sql, SWITCH_TRUE);
+
</ins><span class="cx"> const char *var;
</span><span class="cx"> if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_SECURE);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15419 => 15420)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-11 01:50:43 UTC (rev 15419)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-11 02:10:41 UTC (rev 15420)
</span><span class="lines">@@ -3451,7 +3451,7 @@
</span><span class="cx"> const char *from_user = "", *from_host = "", *to_user = "", *to_host = "", *contact_user = "", *contact_host = "";
</span><span class="cx"> const char *user_agent = "", *call_id = "";
</span><span class="cx"> char *sql = NULL;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (sip->sip_user_agent) {
</span><span class="cx"> user_agent = switch_str_nil(sip->sip_user_agent->g_string);
</span><span class="cx"> }
</span><span class="lines">@@ -3476,23 +3476,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (profile->pres_type) {
</span><ins>+ const char *presence_data = switch_channel_get_variable(channel, "presence_data");
+ const char *presence_id = switch_channel_get_variable(channel, "presence_id");
+ char *full_contact = "";
+
+ if (sip->sip_contact) {
+ full_contact = sip_header_as_string(nua_handle_home(tech_pvt->nh), (void *) sip->sip_contact);
+ }
+
</ins><span class="cx"> sql = switch_mprintf("insert into sip_dialogs "
</span><span class="cx"> "(call_id,uuid,sip_to_user,sip_to_host,sip_from_user,sip_from_host,contact_user,"
</span><del>- "contact_host,state,direction,user_agent,profile_name,hostname) "
- "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')",
</del><ins>+ "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id, presence_data) "
+ "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')",
</ins><span class="cx"> call_id,
</span><span class="cx"> switch_core_session_get_uuid(session),
</span><span class="cx"> to_user, to_host, from_user, from_host, contact_user,
</span><span class="cx"> contact_host, astate, "outbound", user_agent,
</span><del>- profile->name, mod_sofia_globals.hostname);
-
</del><ins>+ profile->name, mod_sofia_globals.hostname, switch_str_nil(full_contact),
+ switch_str_nil(presence_id), switch_str_nil(presence_data));
+
</ins><span class="cx"> switch_assert(sql);
</span><span class="cx">
</span><span class="cx"> sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> } else if (status == 200 && (profile->pres_type)) {
</span><span class="cx"> char *sql = NULL;
</span><del>- sql = switch_mprintf("update sip_dialogs set state='%s' where uuid='%s';\n", astate, switch_core_session_get_uuid(session));
</del><ins>+ const char *presence_data = switch_channel_get_variable(channel, "presence_data");
+ const char *presence_id = switch_channel_get_variable(channel, "presence_id");
+
+ sql = switch_mprintf("update sip_dialogs set state='%q',presence_id='%q',presence_data='%q' "
+ "where uuid='%s';\n", astate, switch_str_nil(presence_id), switch_str_nil(presence_data),
+ switch_core_session_get_uuid(session));
</ins><span class="cx"> switch_assert(sql);
</span><span class="cx"> sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="lines">@@ -5819,16 +5834,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (profile->pres_type) {
</span><ins>+ const char *presence_data = switch_channel_get_variable(channel, "presence_data");
+ const char *presence_id = switch_channel_get_variable(channel, "presence_id");
+ char *full_contact = "";
+
+ if (sip->sip_contact) {
+ full_contact = sip_header_as_string(nua_handle_home(tech_pvt->nh), (void *) sip->sip_contact);
+ }
+
</ins><span class="cx"> sql = switch_mprintf("insert into sip_dialogs "
</span><span class="cx"> "(call_id,uuid,sip_to_user,sip_to_host,sip_from_user,sip_from_host,contact_user,"
</span><del>- "contact_host,state,direction,user_agent,profile_name,hostname) "
- "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')",
</del><ins>+ "contact_host,state,direction,user_agent,profile_name,hostname,contact,presence_id,presence_data) "
+ "values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')",
</ins><span class="cx"> call_id,
</span><span class="cx"> tech_pvt->sofia_private->uuid,
</span><span class="cx"> to_user, to_host, dialog_from_user, dialog_from_host,
</span><span class="cx"> contact_user, contact_host, "confirmed", "inbound", user_agent,
</span><del>- profile->name, mod_sofia_globals.hostname);
</del><ins>+ profile->name, mod_sofia_globals.hostname, switch_str_nil(full_contact),
+ switch_str_nil(presence_id), switch_str_nil(presence_data));
+
</ins><span class="cx"> switch_assert(sql);
</span><ins>+
</ins><span class="cx"> sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</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 (15419 => 15420)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-11 01:50:43 UTC (rev 15419)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-11 02:10:41 UTC (rev 15420)
</span><span class="lines">@@ -3657,7 +3657,10 @@
</span><span class="cx"> " direction VARCHAR(255),\n"
</span><span class="cx"> " user_agent VARCHAR(255),\n"
</span><span class="cx"> " profile_name VARCHAR(255),\n"
</span><del>- " hostname VARCHAR(255)\n"
</del><ins>+ " hostname VARCHAR(255),\n"
+ " contact VARCHAR(255),\n"
+ " presence_id VARCHAR(255),\n"
+ " presence_data VARCHAR(255)\n"
</ins><span class="cx"> ");\n";
</span><span class="cx">
</span><span class="cx"> char sub_sql[] =
</span><span class="lines">@@ -3750,6 +3753,9 @@
</span><span class="cx"> "create index ssa_profile_name on sip_shared_appearance_subscriptions (profile_name)",
</span><span class="cx"> "create index ssa_aor on sip_shared_appearance_subscriptions (aor)",
</span><span class="cx"> "create index ssd_profile_name on sip_shared_appearance_dialogs (profile_name)",
</span><ins>+ "create index ssd_contact on sip_shared_appearance_dialogs (contact)",
+ "create index ssd_presence_id on sip_shared_appearance_dialogs (presence_id)",
+ "create index ssd_presence_data on sip_shared_appearance_dialogs (presence_data)",
</ins><span class="cx"> "create index ssd_hostname on sip_shared_appearance_dialogs (hostname)",
</span><span class="cx"> "create index ssd_contact_str on sip_shared_appearance_dialogs (contact_str)",
</span><span class="cx"> "create index ssd_call_id on sip_shared_appearance_dialogs (call_id)",
</span><span class="lines">@@ -3787,7 +3793,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(test_sql);
</span><del>- test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
</del><ins>+ test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q' and contact like '%%'", mod_sofia_globals.hostname);
</ins><span class="cx">
</span><span class="cx"> if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_dialogs", NULL);
</span><span class="lines">@@ -3852,7 +3858,7 @@
</span><span class="cx"> switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql);
</span><span class="cx"> free(test_sql);
</span><span class="cx">
</span><del>- test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
</del><ins>+ test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q' and contact like '%%'", mod_sofia_globals.hostname);
</ins><span class="cx"> switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql);
</span><span class="cx"> free(test_sql);
</span><span class="cx">
</span><span class="lines">@@ -3926,6 +3932,9 @@
</span><span class="cx">
</span><span class="cx"> switch_core_db_exec(profile->master_db, "create index if not exists sd_uuid on sip_dialogs (uuid)", NULL, NULL, NULL);
</span><span class="cx"> switch_core_db_exec(profile->master_db, "create index if not exists sd_hostname on sip_dialogs (hostname)", NULL, NULL, NULL);
</span><ins>+ switch_core_db_exec(profile->master_db, "create index if not exists sd_hostname on sip_dialogs (contact)", NULL, NULL, NULL);
+ switch_core_db_exec(profile->master_db, "create index if not exists sd_hostname on sip_dialogs (presence_id)", NULL, NULL, NULL);
+ switch_core_db_exec(profile->master_db, "create index if not exists sd_hostname on sip_dialogs (presence_data)", NULL, NULL, NULL);
</ins><span class="cx">
</span><span class="cx"> switch_core_db_exec(profile->master_db, "create index if not exists sp_hostname on sip_presence (hostname)", NULL, NULL, NULL);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>