<!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][15628] </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=15628">15628</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-23 13:46:37 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODSOFIA-40">MODSOFIA-40</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>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/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 (15627 => 15628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-23 19:44:04 UTC (rev 15627)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-23 19:46:37 UTC (rev 15628)
</span><span class="lines">@@ -1935,6 +1935,7 @@
</span><span class="cx"> stream->write_function(stream, "Freq \t%d\n", gp->freq);
</span><span class="cx"> stream->write_function(stream, "Ping \t%d\n", gp->ping);
</span><span class="cx"> stream->write_function(stream, "PingFreq\t%d\n", gp->ping_freq);
</span><ins>+ stream->write_function(stream, "PingState\t%d/%d/%d\n", gp->ping_min, gp->ping_count, gp->ping_max);
</ins><span class="cx"> stream->write_function(stream, "State \t%s\n", sofia_state_names[gp->state]);
</span><span class="cx"> stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : "");
</span><span class="cx"> stream->write_function(stream, "CallsIN \t%d\n", gp->ib_calls);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (15627 => 15628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-23 19:44:04 UTC (rev 15627)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-23 19:46:37 UTC (rev 15628)
</span><span class="lines">@@ -377,6 +377,9 @@
</span><span class="cx"> int pinging;
</span><span class="cx"> sofia_gateway_status_t status;
</span><span class="cx"> uint32_t ping_freq;
</span><ins>+ int ping_count;
+ int ping_max;
+ int ping_min;
</ins><span class="cx"> uint8_t flags[REG_FLAG_MAX];
</span><span class="cx"> int32_t retry_seconds;
</span><span class="cx"> reg_state_t state;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15627 => 15628)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-23 19:44:04 UTC (rev 15627)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-23 19:46:37 UTC (rev 15628)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> * Marcel Barbulescu <marcelbarbulescu@gmail.com>
</span><span class="cx"> * Norman Brandinger
</span><span class="cx"> * Raymond Chandler <intralanman@gmail.com>
</span><ins>+ * Nathan Patrick <npatrick at corp.sonic.net>
</ins><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> * sofia.c -- SOFIA SIP Endpoint (sofia code)
</span><span class="lines">@@ -1450,6 +1451,7 @@
</span><span class="cx"> const char *sipip, *format;
</span><span class="cx"> switch_uuid_t uuid;
</span><span class="cx"> uint32_t ping_freq = 0, extension_in_contact = 0, distinct_to = 0;
</span><ins>+ int ping_max = 0, ping_min = 0;
</ins><span class="cx"> char *register_str = "true", *scheme = "Digest",
</span><span class="cx"> *realm = NULL,
</span><span class="cx"> *username = NULL,
</span><span class="lines">@@ -1479,8 +1481,10 @@
</span><span class="cx"> gateway->next = NULL;
</span><span class="cx"> gateway->ping = 0;
</span><span class="cx"> gateway->ping_freq = 0;
</span><ins>+ gateway->ping_max = 1;
+ gateway->ping_min = -1;
+ gateway->ping_count = 0;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> if ((x_params = switch_xml_child(gateway_tag, "variables"))) {
</span><span class="cx"> param = switch_xml_child(x_params, "variable");
</span><span class="cx"> } else {
</span><span class="lines">@@ -1551,6 +1555,10 @@
</span><span class="cx"> extension = val;
</span><span class="cx"> } else if (!strcmp(var, "ping")) {
</span><span class="cx"> ping_freq = atoi(val);
</span><ins>+ } else if (!strcmp(var, "ping-max")) {
+ ping_max = atoi(val);
+ } else if (!strcmp(var, "ping-min")) {
+ ping_min = atoi(val);
</ins><span class="cx"> } else if (!strcmp(var, "proxy")) {
</span><span class="cx"> proxy = val;
</span><span class="cx"> } else if (!strcmp(var, "context")) {
</span><span class="lines">@@ -1590,6 +1598,8 @@
</span><span class="cx"> if (ping_freq) {
</span><span class="cx"> if (ping_freq >= 5) {
</span><span class="cx"> gateway->ping_freq = ping_freq;
</span><ins>+ gateway->ping_max = ping_max;
+ gateway->ping_min = ping_min;
</ins><span class="cx"> gateway->ping = switch_epoch_time_now(NULL) + ping_freq;
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR: invalid ping!\n");
</span><span class="lines">@@ -3176,6 +3186,7 @@
</span><span class="cx"> tagi_t tags[])
</span><span class="cx"> {
</span><span class="cx"> sofia_gateway_t *gateway = NULL;
</span><ins>+ static const char *status_names[] = { "DOWN", "UP", NULL };
</ins><span class="cx">
</span><span class="cx"> if (sofia_private && !zstr(sofia_private->gateway_name)) {
</span><span class="cx"> gateway = sofia_reg_find_gateway(sofia_private->gateway_name);
</span><span class="lines">@@ -3187,15 +3198,35 @@
</span><span class="cx"> if (gateway->state == REG_STATE_FAILED) {
</span><span class="cx"> gateway->state = REG_STATE_UNREGED;
</span><span class="cx"> }
</span><del>- gateway->status = SOFIA_GATEWAY_UP;
</del><ins>+
+ if (gateway->ping_count < gateway->ping_max) {
+ gateway->ping_count++;
+
+ if (gateway->ping_count >= 0) gateway->status = SOFIA_GATEWAY_UP;
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
+ "Ping succeeded %s with code %d - count %d/%d/%d, state %s\n",
+ gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max,
+ status_names[gateway->status]);
+ }
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Ping failed %s\n", gateway->name);
- gateway->status = SOFIA_GATEWAY_DOWN;
</del><span class="cx"> if (gateway->state == REG_STATE_REGED) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unregister %s\n", gateway->name);
</span><span class="cx"> gateway->state = REG_STATE_FAILED;
</span><span class="cx"> }
</span><ins>+
+ if (gateway->ping_count > gateway->ping_min) {
+ gateway->ping_count--;
+
+ if (gateway->ping_count <= 0) gateway->status = SOFIA_GATEWAY_DOWN;
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
+ "Ping failed %s with code %d - count %d/%d/%d, state %s\n",
+ gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max,
+ status_names[gateway->status]);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> gateway->ping = switch_epoch_time_now(NULL) + gateway->ping_freq;
</span><span class="cx"> sofia_reg_release_gateway(gateway);
</span><span class="cx"> gateway->pinging = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>