<!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][15625] </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=15625">15625</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-23 12:25:11 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix db connection hijacking issue</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</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="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (15624 => 15625)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-11-23 18:15:52 UTC (rev 15624)
+++ freeswitch/trunk/src/include/switch_core.h 2009-11-23 18:25:11 UTC (rev 15625)
</span><span class="lines">@@ -1959,6 +1959,7 @@
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> int32_t flags;
</span><ins>+ unsigned long hash;
</ins><span class="cx"> } switch_cache_db_handle_t;
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (15624 => 15625)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2009-11-23 18:15:52 UTC (rev 15624)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2009-11-23 18:25:11 UTC (rev 15625)
</span><span class="lines">@@ -171,6 +171,8 @@
</span><span class="cx"> if ((dbh = (switch_cache_db_handle_t *) val)) {
</span><span class="cx"> if (switch_mutex_trylock(dbh->mutex) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (strstr(dbh->name, thread_str)) {
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10,
+ "Detach cached DB handle %s [%s]\n", thread_str, switch_cache_db_type_name(dbh->type));
</ins><span class="cx"> switch_clear_flag(dbh, CDF_INUSE);
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(dbh->mutex);
</span><span class="lines">@@ -188,7 +190,10 @@
</span><span class="cx"> {
</span><span class="cx"> switch_thread_id_t self = switch_thread_self();
</span><span class="cx"> char thread_str[CACHE_DB_LEN] = "";
</span><ins>+ char db_str[CACHE_DB_LEN] = "";
</ins><span class="cx"> switch_cache_db_handle_t *new_dbh = NULL;
</span><ins>+ switch_ssize_t hlen = -1;
+
</ins><span class="cx"> const char *db_name = NULL;
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -208,28 +213,33 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
- snprintf(thread_str, sizeof(thread_str) - 1, "%s_%lu", db_name, (unsigned long)(intptr_t)self);
</del><ins>+ snprintf(db_str, sizeof(db_str) - 1, "db=\"%s\"", db_name);
+ snprintf(thread_str, sizeof(thread_str) - 1, "%s;thread=\"%lu\"", db_str, (unsigned long)(intptr_t)self);
</ins><span class="cx">
</span><span class="cx"> switch_mutex_lock(dbh_mutex);
</span><span class="cx"> if ((new_dbh = switch_core_hash_find(dbh_hash, thread_str))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG10,
</ins><span class="cx"> "Reuse Cached DB handle %s [%s]\n", thread_str, switch_cache_db_type_name(new_dbh->type));
</span><span class="cx"> } else {
</span><span class="cx"> switch_hash_index_t *hi;
</span><span class="cx"> const void *var;
</span><span class="cx"> void *val;
</span><span class="cx"> char *key;
</span><ins>+ unsigned long hash = 0;
+
+ hash = switch_ci_hashfunc_default(db_str, &hlen);
</ins><span class="cx">
</span><span class="cx"> for (hi = switch_hash_first(NULL, dbh_hash); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, &var, NULL, &val);
</span><span class="cx"> key = (char *) var;
</span><span class="cx">
</span><span class="cx"> if ((new_dbh = (switch_cache_db_handle_t *) val)) {
</span><del>- if (!switch_test_flag(new_dbh, CDF_INUSE) && switch_mutex_trylock(new_dbh->mutex) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (hash == new_dbh->hash && !strncasecmp(new_dbh->name, db_str, strlen(db_str)) &&
+ !switch_test_flag(new_dbh, CDF_INUSE) && switch_mutex_trylock(new_dbh->mutex) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_set_flag(new_dbh, CDF_INUSE);
</span><span class="cx"> switch_set_string(new_dbh->name, thread_str);
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1,
</del><ins>+ new_dbh->hash = switch_ci_hashfunc_default(db_str, &hlen);
+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG10,
</ins><span class="cx"> "Reuse Unused Cached DB handle %s [%s]\n", thread_str, switch_cache_db_type_name(new_dbh->type));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -278,8 +288,8 @@
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1,
- "Create Cached DB handle %s [%s]\n", thread_str, db ? "sqlite" : "ODBC");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG10,
+ "Create Cached DB handle %s [%s]\n", thread_str, switch_cache_db_type_name(type));
</ins><span class="cx">
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx"> new_dbh = switch_core_alloc(pool, sizeof(*new_dbh));
</span><span class="lines">@@ -287,6 +297,8 @@
</span><span class="cx"> new_dbh->type = type;
</span><span class="cx"> switch_set_string(new_dbh->name, thread_str);
</span><span class="cx"> switch_set_flag(new_dbh, CDF_INUSE);
</span><ins>+ new_dbh->hash = switch_ci_hashfunc_default(db_str, &hlen);
+
</ins><span class="cx">
</span><span class="cx"> if (db) new_dbh->native_handle.core_db_dbh = db; else new_dbh->native_handle.odbc_dbh = odbc_dbh;
</span><span class="cx"> switch_mutex_init(&new_dbh->mutex, SWITCH_MUTEX_UNNESTED, new_dbh->pool);
</span><span class="lines">@@ -1143,7 +1155,7 @@
</span><span class="cx"> runtime.odbc_dsn = NULL;
</span><span class="cx"> runtime.odbc_user = NULL;
</span><span class="cx"> runtime.odbc_pass = NULL;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to sqlite.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to core_db.\n");
</ins><span class="cx"> goto top;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>