<!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][14585] </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=14585">14585</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-08-21 09:48:42 -0500 (Fri, 21 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODENDP-232">MODENDP-232</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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 (14584 => 14585)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-08-21 06:30:00 UTC (rev 14584)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-08-21 14:48:42 UTC (rev 14585)
</span><span class="lines">@@ -1717,7 +1717,7 @@
</span><span class="cx"> char *sql = NULL;
</span><span class="cx">
</span><span class="cx"> if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
</span><del>- if (!argv[2] || strcasecmp(argv[2], "reg")) {
</del><ins>+ if (!argv[2] || (strcasecmp(argv[2], "reg") && strcasecmp(argv[2], "user"))) {
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx"> stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1]));
</span><span class="cx"> stream->write_function(stream, "Domain Name \t%s\n", profile->domain_name ? profile->domain_name : "N/A");
</span><span class="lines">@@ -1792,7 +1792,37 @@
</span><span class="cx"> profile->name, argv[3]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if (!sql && argv[2] && !strcasecmp(argv[2], "user") && argv[3]) {
+ char *dup = strdup(argv[3]);
+ char *host = NULL, *user = NULL;
+ char *sqlextra = NULL;
</ins><span class="cx">
</span><ins>+ switch_assert(dup);
+
+ if ((host = strchr(dup, '@'))) {
+ *host++ = '\0';
+ user = dup;
+ } else {
+ host = dup;
+ }
+
+ if (switch_strlen_zero(user) ) {
+ sqlextra = switch_mprintf("(sip_host='%q')", host);
+ } else if (switch_strlen_zero(host)) {
+ sqlextra = switch_mprintf("(sip_user='%q')", user);
+ } else {
+ sqlextra = switch_mprintf("(sip_user='%q' and sip_host='%q')", user, host);
+ }
+
+ sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status,"
+ "rpid,expires,user_agent,server_user,server_host,profile_name,hostname,"
+ "network_ip,network_port,sip_username,sip_realm"
+ " from sip_registrations where profile_name='%q' and %s",
+ profile->name, sqlextra);
+ switch_safe_free(dup);
+ switch_safe_free(sqlextra);
+ }
+
</ins><span class="cx"> if (!sql) {
</span><span class="cx"> sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status,"
</span><span class="cx"> "rpid,expires,user_agent,server_user,server_host,profile_name,hostname,"
</span><span class="lines">@@ -1917,7 +1947,7 @@
</span><span class="cx"> if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
</span><span class="cx"> stream->write_function(stream, "%s\n", header);
</span><span class="cx"> stream->write_function(stream, "<profile>\n");
</span><del>- if (!argv[2] || strcasecmp(argv[2], "reg")) {
</del><ins>+ if (!argv[2] || (strcasecmp(argv[2], "reg") && strcasecmp(argv[2], "user"))) {
</ins><span class="cx"> stream->write_function(stream, " <profile-info>\n");
</span><span class="cx"> stream->write_function(stream, " <name>%s</name>\n", switch_str_nil(argv[1]));
</span><span class="cx"> stream->write_function(stream, " <domain-name>%s</domain-name>\n", profile->domain_name ? profile->domain_name : "N/A");
</span><span class="lines">@@ -1984,7 +2014,37 @@
</span><span class="cx"> profile->name, argv[3]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if (!sql && argv[2] && !strcasecmp(argv[2], "user") && argv[3]) {
+ char *dup = strdup(argv[3]);
+ char *host = NULL, *user = NULL;
+ char *sqlextra = NULL;
</ins><span class="cx">
</span><ins>+ switch_assert(dup);
+
+ if ((host = strchr(dup, '@'))) {
+ *host++ = '\0';
+ user = dup;
+ } else {
+ host = dup;
+ }
+
+ if (switch_strlen_zero(user)) {
+ sqlextra = switch_mprintf("(sip_host='%q')", host);
+ } else if (switch_strlen_zero(host)) {
+ sqlextra = switch_mprintf("(sip_user='%q')", user);
+ } else {
+ sqlextra = switch_mprintf("(sip_user='%q' and sip_host='%q')", user, host);
+ }
+
+ sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status,"
+ "rpid,expires,user_agent,server_user,server_host,profile_name,hostname,"
+ "network_ip,network_port,sip_username,sip_realm"
+ " from sip_registrations where profile_name='%q' and %s",
+ profile->name, sqlextra);
+ switch_safe_free(dup);
+ switch_safe_free(sqlextra);
+ }
+
</ins><span class="cx"> if (!sql) {
</span><span class="cx"> sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status,"
</span><span class="cx"> "rpid,expires,user_agent,server_user,server_host,profile_name,hostname,"
</span><span class="lines">@@ -2475,7 +2535,7 @@
</span><span class="cx"> "--------------------------------------------------------------------------------\n"
</span><span class="cx"> "sofia help\n"
</span><span class="cx"> "sofia profile <profile_name> [[start|stop|restart|rescan] [reloadxml]|flush_inbound_reg [<call_id>] [reboot]|[register|unregister] [<gateway name>|all]|killgw <gateway name>|[stun-auto-disable|stun-enabled] [true|false]]|siptrace [on|off]\n"
</span><del>- "sofia status profile <name> [ reg <contact str> ] | [ pres <pres str> ]\n"
</del><ins>+ "sofia status profile <name> [ reg <contact str> ] | [ pres <pres str> ] | [ user <user@domain> ]\n"
</ins><span class="cx"> "sofia status gateway <name>\n"
</span><span class="cx"> "sofia loglevel <all|default|tport|iptsec|nea|nta|nth_client|nth_server|nua|soa|sresolv|stun> [0-9]\n"
</span><span class="cx"> "--------------------------------------------------------------------------------\n";
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>