<!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][16820] </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=16820">16820</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-25 09:23:11 -0600 (Thu, 25 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: handle UnregisterMessage and properly flush listener</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</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 (16819 => 16820)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-25 14:34:43 UTC (rev 16819)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-25 15:23:11 UTC (rev 16820)
</span><span class="lines">@@ -990,7 +990,28 @@
</span><span class="cx"> static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch_bool_t flush_events)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- /* TODO */
</del><ins>+ if(!zstr(listener->device_name)) {
+ skinny_profile_t *profile = listener->profile;
+ char *sql;
+
+ if ((sql = switch_mprintf(
+ "DELETE FROM skinny_devices "
+ "WHERE name='%s'",
+ listener->device_name))) {
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
+ switch_safe_free(sql);
+ }
+
+ if ((sql = switch_mprintf(
+ "DELETE FROM skinny_buttons "
+ "WHERE device_name='%s'",
+ listener->device_name))) {
+ skinny_execute_sql(profile, sql, profile->listener_mutex);
+ switch_safe_free(sql);
+ }
+
+ strcpy(listener->device_name, "");
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int dump_device_callback(void *pArg, int argc, char **argv, char **columnNames)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16819 => 16820)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-25 14:34:43 UTC (rev 16819)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-25 15:23:11 UTC (rev 16820)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
</span><span class="cx"> {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
</span><span class="cx"> {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
</span><ins>+ {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
</ins><span class="cx"> {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
</span><span class="cx"> {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
</span><span class="cx"> {NULL, 0}
</span><span class="lines">@@ -1997,9 +1998,21 @@
</span><span class="cx"> switch_status_t skinny_handle_unregister(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_event_t *event = NULL;
</span><ins>+ skinny_message_t *message;
+
</ins><span class="cx"> /* skinny::unregister event */
</span><span class="cx"> skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_UNREGISTER);
</span><span class="cx"> switch_event_fire(&event);
</span><ins>+
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.unregister_ack));
+ message->type = UNREGISTER_ACK_MESSAGE;
+ message->length = 4 + sizeof(message->data.unregister_ack);
+ message->data.unregister_ack.unregister_status = 0; /* OK */
+ skinny_send_reply(listener, message);
+
+ /* Close socket */
+ switch_clear_flag_locked(listener, LFLAG_RUNNING);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2061,8 +2074,8 @@
</span><span class="cx"> case UNREGISTER_MESSAGE:
</span><span class="cx"> return skinny_handle_unregister(listener, request);
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
- "Unknown request type: %x (length=%d).\n", request->type, request->length);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unhandled request %s (type=%x,length=%d).\n", skinny_message_type2str(request->type), request->type, request->length);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h (16819 => 16820)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-25 14:34:43 UTC (rev 16819)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-25 15:23:11 UTC (rev 16820)
</span><span class="lines">@@ -441,6 +441,12 @@
</span><span class="cx"> uint32_t line_instance;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* UnregisterAckMessage */
+#define UNREGISTER_ACK_MESSAGE 0x0118
+struct unregister_ack_message {
+ uint32_t unregister_status;
+};
+
</ins><span class="cx"> /* DialedNumberMessage */
</span><span class="cx"> #define DIALED_NUMBER_MESSAGE 0x011D
</span><span class="cx"> struct dialed_number_message {
</span><span class="lines">@@ -506,6 +512,7 @@
</span><span class="cx"> struct display_prompt_status_message display_prompt_status;
</span><span class="cx"> struct clear_prompt_status_message clear_prompt_status;
</span><span class="cx"> struct activate_call_plane_message activate_call_plane;
</span><ins>+ struct unregister_ack_message unregister_ack;
</ins><span class="cx"> struct dialed_number_message dialed_number;
</span><span class="cx"> struct feature_stat_res_message feature_res;
</span><span class="cx">
</span><span class="lines">@@ -619,7 +626,7 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;\
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct skinny_table SKINNY_MESSAGE_TYPES[52];
</del><ins>+struct skinny_table SKINNY_MESSAGE_TYPES[53];
</ins><span class="cx"> const char *skinny_message_type2str(uint32_t id);
</span><span class="cx"> uint32_t skinny_str2message_type(const char *str);
</span><span class="cx"> #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>