<!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][17514] </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=17514">17514</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2010-05-10 11:33:47 -0500 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_sofia: fire an event for gateway ping</pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (17513 => 17514)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-05-10 16:19:58 UTC (rev 17513)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-05-10 16:33:47 UTC (rev 17514)
</span><span class="lines">@@ -332,7 +332,9 @@
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> SOFIA_GATEWAY_DOWN,
</span><del>- SOFIA_GATEWAY_UP
</del><ins>+ SOFIA_GATEWAY_UP,
+
+ SOFIA_GATEWAY_INVALID
</ins><span class="cx"> } sofia_gateway_status_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -981,3 +983,7 @@
</span><span class="cx"> int sofia_glue_recover(switch_bool_t flush);
</span><span class="cx"> void sofia_profile_destroy(sofia_profile_t *profile);
</span><span class="cx"> switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_core_session_t *session, _In_ switch_stream_handle_t *stream);
</span><ins>+const char *sofia_gateway_status_name(sofia_gateway_status_t status);
+void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway, int status, const char *phrase);
+
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17513 => 17514)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-05-10 16:19:58 UTC (rev 17513)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-05-10 16:33:47 UTC (rev 17514)
</span><span class="lines">@@ -3589,13 +3589,23 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const char *sofia_gateway_status_name(sofia_gateway_status_t status)
+{
+ static const char *status_names[] = { "DOWN", "UP", NULL };
+
+ if (status < SOFIA_GATEWAY_INVALID) {
+ return status_names[status];
+ } else {
+ return "INVALID";
+ }
+}
+
</ins><span class="cx"> static void sofia_handle_sip_r_options(switch_core_session_t *session, int status,
</span><span class="cx"> char const *phrase,
</span><span class="cx"> nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip,
</span><span class="cx"> tagi_t tags[])
</span><span class="cx"> {
</span><span class="cx"> sofia_gateway_t *gateway = NULL;
</span><del>- static const char *status_names[] = { "DOWN", "UP", NULL };
</del><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">@@ -3611,12 +3621,14 @@
</span><span class="cx"> if (gateway->ping_count < gateway->ping_max) {
</span><span class="cx"> gateway->ping_count++;
</span><span class="cx">
</span><del>- if (gateway->ping_count >= 0)
</del><ins>+ if (gateway->ping_count >= 0 && gateway->status != SOFIA_GATEWAY_UP) {
</ins><span class="cx"> gateway->status = SOFIA_GATEWAY_UP;
</span><ins>+ sofia_reg_fire_custom_gateway_state_event(gateway, status, phrase);
+ }
</ins><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</span><span class="cx"> "Ping succeeded %s with code %d - count %d/%d/%d, state %s\n",
</span><del>- gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max, status_names[gateway->status]);
</del><ins>+ gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max, sofia_gateway_status_name(gateway->status));
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (gateway->state == REG_STATE_REGED) {
</span><span class="lines">@@ -3627,13 +3639,15 @@
</span><span class="cx"> if (gateway->ping_count > gateway->ping_min) {
</span><span class="cx"> gateway->ping_count--;
</span><span class="cx">
</span><del>- if (gateway->ping_count <= 0)
</del><ins>+ if (gateway->ping_count <= 0 && gateway->status != SOFIA_GATEWAY_DOWN) {
</ins><span class="cx"> gateway->status = SOFIA_GATEWAY_DOWN;
</span><ins>+ sofia_reg_fire_custom_gateway_state_event(gateway, status, phrase);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</span><span class="cx"> "Ping failed %s with code %d - count %d/%d/%d, state %s\n",
</span><del>- gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max, status_names[gateway->status]);
</del><ins>+ gateway->name, status, gateway->ping_min, gateway->ping_count, gateway->ping_max, sofia_gateway_status_name(gateway->status));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gateway->ping = switch_epoch_time_now(NULL) + gateway->ping_freq;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (17513 => 17514)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-05-10 16:19:58 UTC (rev 17513)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-05-10 16:33:47 UTC (rev 17514)
</span><span class="lines">@@ -90,12 +90,13 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway, int status, const char *phrase)
</del><ins>+void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway, int status, const char *phrase)
</ins><span class="cx"> {
</span><span class="cx"> switch_event_t *s_event;
</span><span class="cx"> if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_GATEWAY_STATE) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "Gateway", gateway->name);
</span><span class="cx"> switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "State", sofia_state_string(gateway->state));
</span><ins>+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "Ping-Status", sofia_gateway_status_name(gateway->status));
</ins><span class="cx"> if (!zstr(phrase)) {
</span><span class="cx"> switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "Phrase", phrase);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>