<!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][14576] </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=14576">14576</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-20 04:30:29 -0500 (Thu, 20 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: patch from Seven Du: channel naming when using 'RR' and 'ANY' interfaces, interface statistics 'sk list' totals</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (14575 => 14576)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-20 09:03:27 UTC (rev 14575)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-20 09:30:29 UTC (rev 14576)
</span><span class="lines">@@ -914,7 +914,15 @@
</span><span class="cx"> if (outbound_profile) {
</span><span class="cx"> char name[128];
</span><span class="cx">
</span><del>- snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number);
</del><ins>+ if (strncmp("ANY", outbound_profile->destination_number, 3 ) == 0) {
+ snprintf(name, sizeof(name), "skypiax/ANY/%s%s", tech_pvt->name, outbound_profile->destination_number+3);
+ } else if (strncmp("RR", outbound_profile->destination_number, 2) == 0) {
+ snprintf(name, sizeof(name), "skypiax/RR/%s%s", tech_pvt->name, outbound_profile->destination_number+2);
+ } else {
+ snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number);
+ }
+
+ //snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number);
</ins><span class="cx"> //snprintf(name, sizeof(name), "skypiax/%s", tech_pvt->name);
</span><span class="cx"> switch_channel_set_name(channel, name);
</span><span class="cx"> caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
</span><span class="lines">@@ -1762,6 +1770,10 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(argv[0], "list")) {
</span><span class="cx"> int i;
</span><ins>+ int ib = 0;
+ int ib_failed = 0;
+ int ob = 0;
+ int ob_failed = 0;
</ins><span class="cx"> char next_flag_char = ' ';
</span><span class="cx">
</span><span class="cx"> stream->write_function(stream, "F ID\t Name \tIB (F/T) OB (F/T)\tState\tCallFlw\t\tUUID\n");
</span><span class="lines">@@ -1769,6 +1781,10 @@
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
</span><span class="cx"> next_flag_char = i == globals.next_interface ? '*' : ' ';
</span><ins>+ ib += globals.SKYPIAX_INTERFACES[i].ib_calls;
+ ib_failed += globals.SKYPIAX_INTERFACES[i].ib_failed_calls;
+ ob += globals.SKYPIAX_INTERFACES[i].ob_calls;
+ ob_failed += globals.SKYPIAX_INTERFACES[i].ob_failed_calls;
</ins><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[i].name)) {
</span><span class="cx"> stream->write_function(stream,
</span><span class="lines">@@ -1786,7 +1802,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>- stream->write_function(stream, "\nTotal: %d\n", globals.real_interfaces - 1);
</del><ins>+ stream->write_function(stream, "\nTotal Interfaces: %d IB Calls(Failed/Total): %ld/%ld OB Calls(Failed/Total): %ld/%ld\n",
+ globals.real_interfaces - 1, ib_failed, ib, ob_failed, ob);
</ins><span class="cx">
</span><span class="cx"> } else if (!strcasecmp(argv[0], "console")) {
</span><span class="cx"> int i;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (14575 => 14576)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2009-08-20 09:03:27 UTC (rev 14575)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2009-08-20 09:30:29 UTC (rev 14576)
</span><span class="lines">@@ -243,10 +243,10 @@
</span><span class="cx"> char transfer_callid_number[50];
</span><span class="cx"> char skype_transfer_call_id[512];
</span><span class="cx"> int running;
</span><del>- unsigned long ib_calls;
- unsigned long ob_calls;
- unsigned long ib_failed_calls;
- unsigned long ob_failed_calls;
</del><ins>+ uint32_t ib_calls;
+ uint32_t ob_calls;
+ uint32_t ib_failed_calls;
+ uint32_t ob_failed_calls;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>