<!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][17234] </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=17234">17234</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-04-07 01:46:00 -0500 (Wed, 07 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add in hostname to sql stmts</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (17233 => 17234)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-07 06:44:56 UTC (rev 17233)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-07 06:46:00 UTC (rev 17234)
</span><span class="lines">@@ -3231,6 +3231,8 @@
</span><span class="cx"> char *command = NULL, *as = NULL;
</span><span class="cx"> switch_core_flag_t cflags = switch_core_flags();
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><ins>+ char hostname[256] = "";
+ gethostname(hostname, sizeof(hostname));
</ins><span class="cx">
</span><span class="cx"> if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> stream->write_function(stream, "%s", "-ERR Databse Error!\n");
</span><span class="lines">@@ -3283,29 +3285,30 @@
</span><span class="cx"> if (end_of(command) == 's') {
</span><span class="cx"> end_of(command) = '\0';
</span><span class="cx"> }
</span><del>- sprintf(sql, "select type, name, ikey from interfaces where type = '%s' order by type,name", command);
</del><ins>+ sprintf(sql, "select type, name, ikey from interfaces where hostname='%s' and type = '%s' order by type,name", hostname, command);
</ins><span class="cx"> } else if (!strncasecmp(command, "module", 6)) {
</span><span class="cx"> if (argv[1]) {
</span><del>- sprintf(sql, "select distinct type, name, ikey, filename from interfaces where ikey = '%s' order by type,name", argv[1]);
</del><ins>+ sprintf(sql, "select distinct type, name, ikey, filename from interfaces where hostname='%s' and ikey = '%s' order by type,name",
+ hostname, argv[1]);
</ins><span class="cx"> } else {
</span><del>- sprintf(sql, "select distinct type, name, ikey, filename from interfaces order by type,name");
</del><ins>+ sprintf(sql, "select distinct type, name, ikey, filename from interfaces where hostname='%s' order by type,name", hostname);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "interfaces")) {
</span><del>- sprintf(sql, "select type, name, ikey from interfaces order by type,name");
</del><ins>+ sprintf(sql, "select type, name, ikey from interfaces where hostname='%s' order by type,name", hostname);
</ins><span class="cx"> } else if (!strcasecmp(command, "interface_types")) {
</span><del>- sprintf(sql, "select type,count(type) as total from interfaces group by type order by type");
</del><ins>+ sprintf(sql, "select type,count(type) as total from interfaces where hostname='%s' group by type order by type", hostname);
</ins><span class="cx"> } else if (!strcasecmp(command, "tasks")) {
</span><del>- sprintf(sql, "select * from %s", command);
</del><ins>+ sprintf(sql, "select * from %s where hostname='%s'", command, hostname);
</ins><span class="cx"> } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) {
</span><span class="cx"> if (argv[1] && strcasecmp(argv[1], "as")) {
</span><span class="cx"> sprintf(sql,
</span><del>- "select name, description, syntax, ikey from interfaces where type = '%s' and description != '' and name = '%s' order by type,name",
- command, argv[1]);
</del><ins>+ "select name, description, syntax, ikey from interfaces where hostname='%s' and type = '%s' and description != '' and name = '%s' order by type,name",
+ hostname, command, argv[1]);
</ins><span class="cx"> } else {
</span><del>- sprintf(sql, "select name, description, syntax, ikey from interfaces where type = '%s' and description != '' order by type,name", command);
</del><ins>+ sprintf(sql, "select name, description, syntax, ikey from interfaces where hostname='%s' and type = '%s' and description != '' order by type,name", hostname, command);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "calls")) {
</span><del>- sprintf(sql, "select * from calls order by call_created_epoch");
</del><ins>+ sprintf(sql, "select * from calls where hostname='%s' order by call_created_epoch", hostname);
</ins><span class="cx"> if (argv[1] && !strcasecmp(argv[1], "count")) {
</span><span class="cx"> holder.justcount = 1;
</span><span class="cx"> if (argv[3] && !strcasecmp(argv[2], "as")) {
</span><span class="lines">@@ -3322,12 +3325,12 @@
</span><span class="cx"> }
</span><span class="cx"> if (strchr(argv[2], '%')) {
</span><span class="cx"> sprintf(sql,
</span><del>- "select * from channels where uuid like '%s' or name like '%s' or cid_name like '%s' or cid_num like '%s' order by created_epoch",
- argv[2], argv[2], argv[2], argv[2]);
</del><ins>+ "select * from channels where hostname='%s' and uuid like '%s' or name like '%s' or cid_name like '%s' or cid_num like '%s' order by created_epoch",
+ hostname, argv[2], argv[2], argv[2], argv[2]);
</ins><span class="cx"> } else {
</span><span class="cx"> sprintf(sql,
</span><del>- "select * from channels where uuid like '%%%s%%' or name like '%%%s%%' or cid_name like '%%%s%%' or cid_num like '%%%s%%' order by created_epoch",
- argv[2], argv[2], argv[2], argv[2]);
</del><ins>+ "select * from channels where hostname='%s' and uuid like '%%%s%%' or name like '%%%s%%' or cid_name like '%%%s%%' or cid_num like '%%%s%%' order by created_epoch",
+ hostname, argv[2], argv[2], argv[2], argv[2]);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3335,10 +3338,10 @@
</span><span class="cx"> as = argv[4];
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- sprintf(sql, "select * from channels order by created_epoch");
</del><ins>+ sprintf(sql, "select * from channels where hostname='%s' order by created_epoch", hostname);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "channels")) {
</span><del>- sprintf(sql, "select * from channels order by created_epoch");
</del><ins>+ sprintf(sql, "select * from channels where hostname='%s' order by created_epoch", hostname);
</ins><span class="cx"> if (argv[1] && !strcasecmp(argv[1], "count")) {
</span><span class="cx"> holder.justcount = 1;
</span><span class="cx"> if (argv[3] && !strcasecmp(argv[2], "as")) {
</span><span class="lines">@@ -3347,14 +3350,14 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "distinct_channels")) {
</span><span class="cx"> sprintf(sql, "select * from channels left join calls on "
</span><del>- "channels.uuid=calls.caller_uuid where channels.uuid not in (select callee_uuid from calls) order by created_epoch");
</del><ins>+ "channels.uuid=calls.caller_uuid where channels.hostname='%s' channels.uuid not in (select callee_uuid from calls where hostname='%s') order by created_epoch", hostname, hostname);
</ins><span class="cx"> if (argv[2] && !strcasecmp(argv[1], "as")) {
</span><span class="cx"> as = argv[2];
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "aliases")) {
</span><del>- sprintf(sql, "select * from aliases order by alias");
</del><ins>+ sprintf(sql, "select * from aliases where hostname='%s' order by alias", hostname);
</ins><span class="cx"> } else if (!strcasecmp(command, "complete")) {
</span><del>- sprintf(sql, "select * from complete order by a1,a2,a3,a4,a5,a6,a7,a8,a9,a10");
</del><ins>+ sprintf(sql, "select * from complete where hostname='%s' order by a1,a2,a3,a4,a5,a6,a7,a8,a9,a10", hostname);
</ins><span class="cx"> } else if (!strncasecmp(command, "help", 4)) {
</span><span class="cx"> char *cmdname = NULL;
</span><span class="cx">
</span><span class="lines">@@ -3363,9 +3366,10 @@
</span><span class="cx"> if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) {
</span><span class="cx"> *cmdname++ = '\0';
</span><span class="cx"> switch_snprintf(sql, sizeof(sql) - 1,
</span><del>- "select name, syntax, description, ikey from interfaces where type = 'api' and name = '%s' order by name", cmdname);
</del><ins>+ "select name, syntax, description, ikey from interfaces where hostname='%s' and type = 'api' and name = '%s' order by name",
+ hostname, cmdname);
</ins><span class="cx"> } else {
</span><del>- switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, ikey from interfaces where type = 'api' order by name");
</del><ins>+ switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, ikey from interfaces where hostname='%s' and type = 'api' order by name", hostname);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(command, "nat_map")) {
</span><span class="cx"> switch_snprintf(sql, sizeof(sql) - 1,
</span><span class="lines">@@ -3373,7 +3377,7 @@
</span><span class="cx"> " CASE proto "
</span><span class="cx"> " WHEN 0 THEN 'udp' "
</span><span class="cx"> " WHEN 1 THEN 'tcp' "
</span><del>- " ELSE 'unknown' " " END AS proto, " " proto AS proto_num, " " sticky " " FROM nat ORDER BY port, proto");
</del><ins>+ " ELSE 'unknown' " " END AS proto, " " proto AS proto_num, " " sticky " " FROM nat where hostname='%s' ORDER BY port, proto", hostname);
</ins><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX);
</span><span class="cx"> goto end;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>