<!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][16750] </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=16750">16750</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 05:58:07 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Milestone 1 : device level (timeout)
- handle keepalive message (expiration)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16749 => 16750)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:58:00 UTC (rev 16749)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:58:07 UTC (rev 16750)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> char *codec_rates_string;
</span><span class="cx"> char *codec_rates[SWITCH_MAX_CODECS];
</span><span class="cx"> int codec_rates_last;
</span><del>- int keep_alive;
</del><ins>+ uint32_t keep_alive;
</ins><span class="cx"> char date_format[6];
</span><span class="cx"> /* data */
</span><span class="cx"> switch_event_node_t *heartbeat_node;
</span><span class="lines">@@ -129,6 +129,8 @@
</span><span class="cx"> char reserved2[4];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define KEEP_ALIVE_ACK_MESSAGE 0x0100
+
</ins><span class="cx"> #define SKINNY_MESSAGE_FIELD_SIZE 4 /* 4-bytes field */
</span><span class="cx"> #define SKINNY_MESSAGE_HEADERSIZE 12 /* three 4-bytes fields */
</span><span class="cx"> #define SKINNY_MESSAGE_MAXSIZE 1000
</span><span class="lines">@@ -197,9 +199,10 @@
</span><span class="cx"> } listen_list;
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-/* CHANNEL FUNCTIONS */
</del><ins>+/* FUNCTIONS */
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><ins>+/* CHANNEL FUNCTIONS */
</ins><span class="cx"> static switch_status_t channel_on_init(switch_core_session_t *session);
</span><span class="cx"> static switch_status_t channel_on_hangup(switch_core_session_t *session);
</span><span class="cx"> static switch_status_t channel_on_destroy(switch_core_session_t *session);
</span><span class="lines">@@ -214,6 +217,13 @@
</span><span class="cx"> static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
</span><span class="cx">
</span><span class="cx">
</span><ins>+/* LISTENER FUNCTIONS */
+static switch_status_t keepalive_listener(listener_t *listener);
+
+/*****************************************************************************/
+/* CHANNEL FUNCTIONS */
+/*****************************************************************************/
+
</ins><span class="cx"> static void tech_init(private_t *tech_pvt, switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> tech_pvt->read_frame.data = tech_pvt->databuf;
</span><span class="lines">@@ -608,11 +618,9 @@
</span><span class="cx"> /* SKINNY FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><del>-static switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req, uint32_t timeout)
</del><ins>+static switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
</ins><span class="cx"> {
</span><span class="cx"> skinny_message_t *request;
</span><del>- uint32_t elapsed = 0;
- time_t start = 0;
</del><span class="cx"> switch_size_t mlen, bytes = 0;
</span><span class="cx"> char mbuf[SKINNY_MESSAGE_MAXSIZE] = "";
</span><span class="cx"> char *ptr;
</span><span class="lines">@@ -629,7 +637,6 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- start = switch_epoch_time_now(NULL);
</del><span class="cx"> ptr = mbuf;
</span><span class="cx">
</span><span class="cx"> while (listener->sock && running) {
</span><span class="lines">@@ -681,13 +688,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (timeout) {
- elapsed = (uint32_t) (switch_epoch_time_now(NULL) - start);
- if (elapsed >= timeout) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Socket timed out.\n");
- switch_clear_flag_locked(listener, LFLAG_RUNNING);
- return SWITCH_STATUS_FALSE;
- }
</del><ins>+ if (listener->expire_time && listener->expire_time < switch_epoch_time_now(NULL)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Listener timed out.\n");
+ switch_clear_flag_locked(listener, LFLAG_RUNNING);
+ return SWITCH_STATUS_FALSE;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -731,12 +735,16 @@
</span><span class="cx"> reply->data.reg_ack.secondaryKeepAlive = globals.keep_alive;
</span><span class="cx"> /* TODO send CapabilitiesReqMessage (and parse the CapabilitiesResMessage) */
</span><span class="cx"> /* TODO event */
</span><ins>+ keepalive_listener(listener);
</ins><span class="cx"> break;
</span><span class="cx"> case PORT_MESSAGE:
</span><span class="cx"> /* Nothing to do */
</span><span class="cx"> break;
</span><span class="cx"> case KEEP_ALIVE_MESSAGE:
</span><del>- /* TODO */
</del><ins>+ reply = switch_core_alloc(listener->pool, 12);
+ reply->type = KEEP_ALIVE_ACK_MESSAGE;
+ reply->length = 4;
+ keepalive_listener(listener);
</ins><span class="cx"> break;
</span><span class="cx"> /* TODO */
</span><span class="cx"> default:
</span><span class="lines">@@ -817,26 +825,6 @@
</span><span class="cx"> /* TODO */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t expire_listener(listener_t *listener)
-{
- if (!listener->expire_time) {
- listener->expire_time = switch_epoch_time_now(NULL);
- }
-
- if (switch_thread_rwlock_trywrlock(listener->rwlock) != SWITCH_STATUS_SUCCESS) {
- return SWITCH_STATUS_FALSE;
- }
-
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_CRIT, "Stateful Listener %u has expired\n", listener->id);
-
- flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE);
-
- switch_thread_rwlock_unlock(listener->rwlock);
- switch_core_destroy_memory_pool(&listener->pool);
-
- return SWITCH_STATUS_SUCCESS;
-}
-
</del><span class="cx"> static void close_socket(switch_socket_t **sock)
</span><span class="cx"> {
</span><span class="cx"> switch_mutex_lock(listen_list.sock_mutex);
</span><span class="lines">@@ -850,11 +838,29 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t kill_listener(listener_t *listener)
</span><span class="cx"> {
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Killing listener.\n");
</ins><span class="cx"> switch_clear_flag(listener, LFLAG_RUNNING);
</span><span class="cx"> close_socket(&listener->sock);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static switch_status_t kill_expired_listener(listener_t *listener)
+{
+ if(listener->expire_time < switch_epoch_time_now(NULL)) {
+ return kill_listener(listener);
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t keepalive_listener(listener_t *listener)
+{
+ switch_assert(listener);
+
+ listener->expire_time = switch_epoch_time_now(NULL)+globals.keep_alive*110/100;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="cx"> listener_t *listener = (listener_t *) obj;
</span><span class="lines">@@ -889,11 +895,12 @@
</span><span class="cx">
</span><span class="cx"> switch_socket_opt_set(listener->sock, SWITCH_SO_NONBLOCK, TRUE);
</span><span class="cx"> switch_set_flag_locked(listener, LFLAG_RUNNING);
</span><ins>+ keepalive_listener(listener);
</ins><span class="cx"> add_listener(listener);
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> while (running && switch_test_flag(listener, LFLAG_RUNNING) && listen_list.ready) {
</span><del>- status = skinny_read_packet(listener, &request, 30);
</del><ins>+ status = skinny_read_packet(listener, &request);
</ins><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Socket Error!\n");
</span><span class="lines">@@ -1136,7 +1143,7 @@
</span><span class="cx"> static void event_handler(switch_event_t *event)
</span><span class="cx"> {
</span><span class="cx"> if (event->event_id == SWITCH_EVENT_HEARTBEAT) {
</span><del>- walk_listeners(expire_listener);
</del><ins>+ walk_listeners(kill_expired_listener);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>