<!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][16728] </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=16728">16728</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-02-22 17:41:56 -0600 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> cleanup </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16727 => 16728)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-02-22 23:41:34 UTC (rev 16727)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-02-22 23:41:56 UTC (rev 16728)
</span><span class="lines">@@ -4303,7 +4303,10 @@
</span><span class="cx"> char recovery_sql[] =
</span><span class="cx"> "CREATE TABLE sip_recovery (\n"
</span><span class="cx"> " runtime_uuid VARCHAR(255),\n"
</span><del>- " profile_name VARCHAR(255),\n" " hostname VARCHAR(255),\n" " uuid VARCHAR(255),\n" " metadata text\n" ");\n";
</del><ins>+ " profile_name VARCHAR(255),\n"
+ " hostname VARCHAR(255),\n"
+ " uuid VARCHAR(255),\n"
+ " metadata text\n" ");\n";
</ins><span class="cx">
</span><span class="cx"> char pres_sql[] =
</span><span class="cx"> "CREATE TABLE sip_presence (\n"
</span><span class="lines">@@ -4314,7 +4317,10 @@
</span><span class="cx"> " expires INTEGER,\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" " network_ip VARCHAR(255),\n" " network_port VARCHAR(6)\n" ");\n";
</del><ins>+ " hostname VARCHAR(255),\n"
+ " network_ip VARCHAR(255),\n"
+ " network_port VARCHAR(6)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> char dialog_sql[] =
</span><span class="cx"> "CREATE TABLE sip_dialogs (\n"
</span><span class="lines">@@ -4334,7 +4340,10 @@
</span><span class="cx"> " contact VARCHAR(255),\n"
</span><span class="cx"> " presence_id VARCHAR(255),\n"
</span><span class="cx"> " presence_data VARCHAR(255),\n"
</span><del>- " call_info VARCHAR(255),\n" " call_info_state VARCHAR(255),\n" " expires INTEGER default 0\n" ");\n";
</del><ins>+ " call_info VARCHAR(255),\n"
+ " call_info_state VARCHAR(255),\n"
+ " expires INTEGER default 0\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> char sub_sql[] =
</span><span class="cx"> "CREATE TABLE sip_subscriptions (\n"
</span><span class="lines">@@ -4353,12 +4362,19 @@
</span><span class="cx"> " user_agent VARCHAR(255),\n"
</span><span class="cx"> " accept VARCHAR(255),\n"
</span><span class="cx"> " profile_name VARCHAR(255),\n"
</span><del>- " hostname VARCHAR(255),\n" " network_port VARCHAR(6),\n" " network_ip VARCHAR(255)\n" ");\n";
</del><ins>+ " hostname VARCHAR(255),\n"
+ " network_port VARCHAR(6),\n"
+ " network_ip VARCHAR(255)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> char auth_sql[] =
</span><span class="cx"> "CREATE TABLE sip_authentication (\n"
</span><span class="cx"> " nonce VARCHAR(255),\n"
</span><del>- " expires INTEGER," " profile_name VARCHAR(255),\n" " hostname VARCHAR(255),\n" " last_nc INTEGER\n" ");\n";
</del><ins>+ " expires INTEGER,"
+ " profile_name VARCHAR(255),\n"
+ " hostname VARCHAR(255),\n"
+ " last_nc INTEGER\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> /* should we move this glue to sofia_sla or keep it here where all db init happens? XXX MTK */
</span><span class="cx"> char shared_appearance_sql[] =
</span><span class="lines">@@ -4367,14 +4383,20 @@
</span><span class="cx"> " call_id VARCHAR(255),\n"
</span><span class="cx"> " aor VARCHAR(255),\n"
</span><span class="cx"> " profile_name VARCHAR(255),\n"
</span><del>- " hostname VARCHAR(255),\n" " contact_str VARCHAR(255),\n" " network_ip VARCHAR(255)\n" ");\n";
</del><ins>+ " hostname VARCHAR(255),\n"
+ " contact_str VARCHAR(255),\n"
+ " network_ip VARCHAR(255)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> char shared_appearance_dialogs_sql[] =
</span><span class="cx"> "CREATE TABLE sip_shared_appearance_dialogs (\n"
</span><span class="cx"> " profile_name VARCHAR(255),\n"
</span><span class="cx"> " hostname VARCHAR(255),\n"
</span><span class="cx"> " contact_str VARCHAR(255),\n"
</span><del>- " call_id VARCHAR(255),\n" " network_ip VARCHAR(255),\n" " expires INTEGER\n" ");\n";
</del><ins>+ " call_id VARCHAR(255),\n"
+ " network_ip VARCHAR(255),\n"
+ " expires INTEGER\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> if (switch_odbc_available() && profile->odbc_dsn) {
</span><span class="cx"> int x;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (16727 => 16728)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2010-02-22 23:41:34 UTC (rev 16727)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2010-02-22 23:41:56 UTC (rev 16728)
</span><span class="lines">@@ -1152,10 +1152,20 @@
</span><span class="cx"> " a4 VARCHAR(128),\n"
</span><span class="cx"> " a5 VARCHAR(128),\n"
</span><span class="cx"> " a6 VARCHAR(128),\n"
</span><del>- " a7 VARCHAR(128),\n" " a8 VARCHAR(128),\n" " a9 VARCHAR(128),\n" " a10 VARCHAR(128),\n" " hostname VARCHAR(256)\n" ");\n";
</del><ins>+ " a7 VARCHAR(128),\n"
+ " a8 VARCHAR(128),\n"
+ " a9 VARCHAR(128),\n"
+ " a10 VARCHAR(128),\n"
+ " hostname VARCHAR(256)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> static char create_alias_sql[] =
</span><del>- "CREATE TABLE aliases (\n" " sticky INTEGER,\n" " alias VARCHAR(128),\n" " command VARCHAR(4096),\n" " hostname VARCHAR(256)\n" ");\n";
</del><ins>+ "CREATE TABLE aliases (\n"
+ " sticky INTEGER,\n"
+ " alias VARCHAR(128),\n"
+ " command VARCHAR(4096),\n"
+ " hostname VARCHAR(256)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> static char create_channels_sql[] =
</span><span class="cx"> "CREATE TABLE channels (\n"
</span><span class="lines">@@ -1179,7 +1189,10 @@
</span><span class="cx"> " write_rate VARCHAR(32),\n"
</span><span class="cx"> " secure VARCHAR(32),\n"
</span><span class="cx"> " hostname VARCHAR(256),\n"
</span><del>- " presence_id VARCHAR(4096),\n" " presence_data VARCHAR(4096)\n" ");\ncreate index uuindex on channels (uuid,hostname);\n";
</del><ins>+ " presence_id VARCHAR(4096),\n"
+ " presence_data VARCHAR(4096)\n"
+ ");\ncreate index uuindex on channels (uuid,hostname);\n";
+
</ins><span class="cx"> static char create_calls_sql[] =
</span><span class="cx"> "CREATE TABLE calls (\n"
</span><span class="cx"> " call_created VARCHAR(128),\n"
</span><span class="lines">@@ -1197,20 +1210,34 @@
</span><span class="cx"> " callee_uuid VARCHAR(256),\n"
</span><span class="cx"> " hostname VARCHAR(256)\n"
</span><span class="cx"> ");\n" "create index eruuindex on calls (caller_uuid,hostname);\n" "create index eeuuindex on calls (callee_uuid,hostname);\n";
</span><ins>+
</ins><span class="cx"> static char create_interfaces_sql[] =
</span><span class="cx"> "CREATE TABLE interfaces (\n"
</span><span class="cx"> " type VARCHAR(128),\n"
</span><span class="cx"> " name VARCHAR(1024),\n"
</span><span class="cx"> " description VARCHAR(4096),\n"
</span><span class="cx"> " ikey VARCHAR(1024),\n"
</span><del>- " filename VARCHAR(4096),\n" " syntax VARCHAR(4096),\n" " hostname VARCHAR(256)\n" ");\n";
</del><ins>+ " filename VARCHAR(4096),\n"
+ " syntax VARCHAR(4096),\n"
+ " hostname VARCHAR(256)\n"
+ ");\n";
+
</ins><span class="cx"> static char create_tasks_sql[] =
</span><span class="cx"> "CREATE TABLE tasks (\n"
</span><span class="cx"> " task_id INTEGER,\n"
</span><span class="cx"> " task_desc VARCHAR(4096),\n"
</span><del>- " task_group VARCHAR(1024),\n" " task_sql_manager INTEGER,\n" " hostname VARCHAR(256)\n" ");\n";
</del><ins>+ " task_group VARCHAR(1024),\n"
+ " task_sql_manager INTEGER,\n"
+ " hostname VARCHAR(256)\n"
+ ");\n";
+
</ins><span class="cx"> static char create_nat_sql[] =
</span><del>- "CREATE TABLE nat (\n" " sticky INTEGER,\n" " port INTEGER,\n" " proto INTEGER,\n" " hostname VARCHAR(256)\n" ");\n";
</del><ins>+ "CREATE TABLE nat (\n"
+ " sticky INTEGER,\n"
+ " port INTEGER,\n"
+ " proto INTEGER,\n"
+ " hostname VARCHAR(256)\n"
+ ");\n";
</ins><span class="cx">
</span><span class="cx"> switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_t manage)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>