<!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][17403] </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=17403">17403</a></dd>
<dt>Author</dt> <dd>mike</dd>
<dt>Date</dt> <dd>2010-04-26 04:26:54 -0500 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_sofia: add EXPSECS time till reg expire and total to status return</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 (17402 => 17403)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-26 09:24:05 UTC (rev 17402)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-26 09:26:54 UTC (rev 17403)
</span><span class="lines">@@ -2111,6 +2111,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct cb_helper {
</span><ins>+ uint32_t row_process;
</ins><span class="cx"> sofia_profile_t *profile;
</span><span class="cx"> switch_stream_handle_t *stream;
</span><span class="cx"> };
</span><span class="lines">@@ -2121,12 +2122,17 @@
</span><span class="cx"> {
</span><span class="cx"> struct cb_helper *cb = (struct cb_helper *) pArg;
</span><span class="cx"> char exp_buf[128] = "";
</span><ins>+ int exp_secs = 0;
</ins><span class="cx"> switch_time_exp_t tm;
</span><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (argv[6]) {
</span><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> switch_time_t etime = atoi(argv[6]);
</span><span class="cx"> switch_size_t retsize;
</span><del>-
</del><ins>+
+ exp_secs = etime - now;
</ins><span class="cx"> switch_time_exp_lt(&tm, switch_time_from_sec(etime));
</span><span class="cx"> switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
</span><span class="cx"> }
</span><span class="lines">@@ -2136,7 +2142,7 @@
</span><span class="cx"> "User: \t%s@%s\n"
</span><span class="cx"> "Contact: \t%s\n"
</span><span class="cx"> "Agent: \t%s\n"
</span><del>- "Status: \t%s(%s) EXP(%s)\n"
</del><ins>+ "Status: \t%s(%s) EXP(%s) EXPSECS(%d)\n"
</ins><span class="cx"> "Host: \t%s\n"
</span><span class="cx"> "IP: \t%s\n"
</span><span class="cx"> "Port: \t%s\n"
</span><span class="lines">@@ -2144,7 +2150,7 @@
</span><span class="cx"> "Auth-Realm: \t%s\n"
</span><span class="cx"> "MWI-Account:\t%s@%s\n\n",
</span><span class="cx"> switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_str_nil(argv[3]),
</span><del>- switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11]),
</del><ins>+ switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, exp_secs, switch_str_nil(argv[11]),
</ins><span class="cx"> switch_str_nil(argv[12]), switch_str_nil(argv[13]), switch_str_nil(argv[14]), switch_str_nil(argv[15]),
</span><span class="cx"> switch_str_nil(argv[16]), switch_str_nil(argv[17]));
</span><span class="cx"> return 0;
</span><span class="lines">@@ -2157,11 +2163,16 @@
</span><span class="cx"> switch_time_exp_t tm;
</span><span class="cx"> const int buflen = 2048;
</span><span class="cx"> char xmlbuf[2048];
</span><ins>+ int exp_secs = 0;
</ins><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (argv[6]) {
</span><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> switch_time_t etime = atoi(argv[6]);
</span><span class="cx"> switch_size_t retsize;
</span><span class="cx">
</span><ins>+ exp_secs = etime - now;
</ins><span class="cx"> switch_time_exp_lt(&tm, switch_time_from_sec(etime));
</span><span class="cx"> switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
</span><span class="cx"> }
</span><span class="lines">@@ -2171,7 +2182,7 @@
</span><span class="cx"> cb->stream->write_function(cb->stream," <user>%s@%s</user>\n", switch_str_nil(argv[1]), switch_str_nil(argv[2]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <contact>%s</contact>\n", switch_amp_encode(switch_str_nil(argv[3]), xmlbuf, buflen));
</span><span class="cx"> cb->stream->write_function(cb->stream," <agent>%s</agent>\n", switch_str_nil(argv[7]));
</span><del>- cb->stream->write_function(cb->stream," <status>%s(%s) exp(%s)</status>\n", switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf);
</del><ins>+ cb->stream->write_function(cb->stream," <status>%s(%s) exp(%s) expsecs(%d)</status>\n", switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, exp_secs);
</ins><span class="cx"> cb->stream->write_function(cb->stream," <host>%s</host>\n", switch_str_nil(argv[11]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <network-ip>%s</network-ip>\n", switch_str_nil(argv[12]));
</span><span class="cx"> cb->stream->write_function(cb->stream," <network-port>%s</network-port>\n", switch_str_nil(argv[13]));
</span><span class="lines">@@ -2288,7 +2299,7 @@
</span><span class="cx"> } else if (!strcasecmp(argv[0], "profile")) {
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> char *sql = NULL;
</span><del>-
</del><ins>+ cb.row_process = 0;
</ins><span class="cx"> if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) {
</span><span class="cx"> if (!argv[2] || (strcasecmp(argv[2], "reg") && strcasecmp(argv[2], "user"))) {
</span><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="lines">@@ -2409,6 +2420,7 @@
</span><span class="cx"> sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, show_reg_callback, &cb);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="cx">
</span><ins>+ stream->write_function(stream, "Total items returned: %d\n", cb.row_process);
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx">
</span><span class="cx"> sofia_glue_release_profile(profile);
</span><span class="lines">@@ -2564,6 +2576,7 @@
</span><span class="cx"> } else if (!strcasecmp(argv[0], "profile")) {
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> char *sql = NULL;
</span><ins>+ cb.row_process = 0;
</ins><span class="cx">
</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="lines">@@ -2982,6 +2995,8 @@
</span><span class="cx"> struct cb_helper *cb = (struct cb_helper *) pArg;
</span><span class="cx"> char *contact;
</span><span class="cx">
</span><ins>+ cb->row_process++;
+
</ins><span class="cx"> if (!zstr(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) {
</span><span class="cx"> cb->stream->write_function(cb->stream, "%ssofia/%s/sip:%s,", argv[2], argv[1], sofia_glue_strip_proto(contact));
</span><span class="cx"> free(contact);
</span><span class="lines">@@ -3163,6 +3178,8 @@
</span><span class="cx"> struct cb_helper cb;
</span><span class="cx"> switch_stream_handle_t mystream = { 0 };
</span><span class="cx">
</span><ins>+ cb.row_process = 0;
+
</ins><span class="cx"> if (!domain || (!strchr(domain, '.') && strcmp(profile_name, domain))) {
</span><span class="cx"> domain = profile->name;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>