<!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][16763] </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=16763">16763</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 05:59:56 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: SQL updates
- new switch_odbc_handle_exec argument
- add codec_string to device record
- minor changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16762 => 16763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:59:49 UTC (rev 16762)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:59:56 UTC (rev 16763)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> if (switch_odbc_available() && profile->odbc_dsn) {
</span><span class="cx"> switch_odbc_statement_handle_t stmt;
</span><del>- if (switch_odbc_handle_exec(profile->master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) {
</del><ins>+ if (switch_odbc_handle_exec(profile->master_odbc, sql, &stmt, NULL) != SWITCH_ODBC_SUCCESS) {
</ins><span class="cx"> char *err_str;
</span><span class="cx"> err_str = switch_odbc_handle_get_error(profile->master_odbc, stmt);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str));
</span><span class="lines">@@ -1046,7 +1046,7 @@
</span><span class="cx">
</span><span class="cx"> switch_event_create_subclass(&event, event_id, subclass_name);
</span><span class="cx"> switch_assert(event);
</span><del>- if ((sql = switch_mprintf("select * from skinny_devices where device_name='%s'", listener->device_name))) {
</del><ins>+ if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE device_name='%s'", listener->device_name))) {
</ins><span class="cx"> skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_device_event_callback, event);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="lines">@@ -1192,6 +1192,9 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><ins>+ char *sql;
+ skinny_profile_t *profile;
+
</ins><span class="cx"> uint32_t i = 0;
</span><span class="cx"> uint32_t n = 0;
</span><span class="cx"> char *codec_order[SWITCH_MAX_CODECS];
</span><span class="lines">@@ -1199,6 +1202,11 @@
</span><span class="cx">
</span><span class="cx"> size_t string_len, string_pos, pos;
</span><span class="cx">
</span><ins>+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
</ins><span class="cx"> n = request->data.cap_res.count;
</span><span class="cx"> if (n > SWITCH_MAX_CODECS) {
</span><span class="cx"> n = SWITCH_MAX_CODECS;
</span><span class="lines">@@ -1224,7 +1232,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> codec_string[string_len] = '\0';
</span><del>- /* TODO SQL update */
</del><ins>+ if ((sql = switch_mprintf(
+ "UPDATE skinny_devices SET codec_string='%s' WHERE device_name='%s'",
+ codec_string,
+ listener->device_name
+ ))) {
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
+ switch_safe_free(sql);
+ }
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</span><span class="cx"> "Codecs %s supported.\n", codec_string);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1241,7 +1256,7 @@
</span><span class="cx"> profile = listener->profile;
</span><span class="cx">
</span><span class="cx"> if ((sql = switch_mprintf(
</span><del>- "update skinny_devices set port='%d' where device_name='%s'",
</del><ins>+ "UPDATE skinny_devices SET port='%d' WHERE device_name='%s'",
</ins><span class="cx"> request->data.as_uint16,
</span><span class="cx"> listener->device_name
</span><span class="cx"> ))) {
</span><span class="lines">@@ -1282,7 +1297,7 @@
</span><span class="cx"> message->data.line_res.number = request->data.line_req.number;
</span><span class="cx">
</span><span class="cx"> if ((sql = switch_mprintf(
</span><del>- "select * from skinny_lines where device_name='%s' and line_position='%d'",
</del><ins>+ "SELECT * FROM skinny_lines WHERE device_name='%s' AND line_position='%d'",
</ins><span class="cx"> listener->device_name,
</span><span class="cx"> request->data.line_req.number
</span><span class="cx"> ))) {
</span><span class="lines">@@ -1472,7 +1487,7 @@
</span><span class="cx"> static switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream)
</span><span class="cx"> {
</span><span class="cx"> char *sql;
</span><del>- if ((sql = switch_mprintf("select * from skinny_devices where device_name LIKE '%s'",
</del><ins>+ if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE device_name LIKE '%s'",
</ins><span class="cx"> device_name))) {
</span><span class="cx"> skinny_execute_sql_callback(profile, profile->listener_mutex, sql, dump_device_callback, stream);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="lines">@@ -1878,14 +1893,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn);
</span><del>- switch_odbc_handle_exec(profile->master_odbc, devices_sql, NULL);
- switch_odbc_handle_exec(profile->master_odbc, lines_sql, NULL);
- switch_odbc_handle_exec(profile->master_odbc, speeddials_sql, NULL);
</del><ins>+ switch_odbc_handle_exec(profile->master_odbc, devices_sql, NULL, NULL);
+ switch_odbc_handle_exec(profile->master_odbc, lines_sql, NULL, NULL);
+ switch_odbc_handle_exec(profile->master_odbc, speeddials_sql, NULL, NULL);
</ins><span class="cx"> } else {
</span><span class="cx"> if ((db = switch_core_db_open_file(profile->dbname))) {
</span><del>- switch_core_db_test_reactive(db, "select * from skinny_devices", NULL, devices_sql);
- switch_core_db_test_reactive(db, "select * from skinny_lines", NULL, lines_sql);
- switch_core_db_test_reactive(db, "select * from skinny_speeddials", NULL, speeddials_sql);
</del><ins>+ switch_core_db_test_reactive(db, "SELECT * FROM skinny_devices", NULL, devices_sql);
+ switch_core_db_test_reactive(db, "SELECT * FROM skinny_lines", NULL, lines_sql);
+ switch_core_db_test_reactive(db, "SELECT * FROM skinny_speeddials", NULL, speeddials_sql);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n");
</span><span class="cx"> continue;
</span><span class="lines">@@ -2013,6 +2028,8 @@
</span><span class="cx"> switch_console_callback_match_t *my_matches = (switch_console_callback_match_t *) pArg;
</span><span class="cx">
</span><span class="cx"> char *device_name = argv[0];
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
+ "Adding %s to matches.\n", device_name);
</ins><span class="cx"> switch_console_push_match(&my_matches, device_name);
</span><span class="cx"> pArg = my_matches;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2038,7 +2055,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if((profile = get_profile(argv[3]))) {
</span><del>- if ((sql = switch_mprintf("select device_name from skinny_devices"))) {
</del><ins>+ if ((sql = switch_mprintf("SELECT device_name FROM skinny_devices"))) {
</ins><span class="cx"> skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_list_devices_callback, my_matches);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>