<!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][16757] </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=16757">16757</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 05:59:10 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: one function per message type</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 (16756 => 16757)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:59:02 UTC (rev 16756)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:59:10 UTC (rev 16757)
</span><span class="lines">@@ -906,6 +906,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Message handling */
</ins><span class="cx"> static switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -957,7 +958,7 @@
</span><span class="cx"> if(users) {
</span><span class="cx"> for (user = switch_xml_child(users, "user"); user; user = user->next) {
</span><span class="cx"> const char *id = switch_xml_attr_soft(user, "id");
</span><del>- const char *type = switch_xml_attr_soft(user, "type");
</del><ins>+ //const char *type = switch_xml_attr_soft(user, "type");
</ins><span class="cx"> //TODO device->line[device->line_last].device = *device;
</span><span class="cx"> strcpy(device->line[device->line_last].name, id);
</span><span class="cx"> strcpy(device->line[device->line_last].shortname, id);
</span><span class="lines">@@ -998,87 +999,113 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request)
</del><ins>+static switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny_message_t *request)
</ins><span class="cx"> {
</span><del>- skinny_message_t *message;
- skinny_device_t *device;
</del><ins>+ skinny_device_t *device = listener->device;
</ins><span class="cx"> uint32_t i = 0;
</span><span class="cx"> uint32_t n = 0;
</span><span class="cx"> size_t string_len, string_pos, pos;
</span><span class="cx">
</span><ins>+ n = request->data.cap_res.count;
+ if (n > SWITCH_MAX_CODECS) {
+ n = SWITCH_MAX_CODECS;
+ }
+ string_len = -1;
+ for (i = 0; i < n; i++) {
+ char *codec = skinny_codec2string(request->data.cap_res.caps[i].codec);
+ device->codec_order[i] = codec;
+ string_len += strlen(codec)+1;
+ }
+ i = 0;
+ pos = 0;
+ device->codec_string = realloc(device->codec_string, string_len+1);
+ for (string_pos = 0; string_pos < string_len; string_pos++) {
+ char *codec = device->codec_order[i];
+ switch_assert(i < n);
+ if(pos == strlen(codec)) {
+ device->codec_string[string_pos] = ',';
+ i++;
+ pos = 0;
+ } else {
+ device->codec_string[string_pos] = codec[pos++];
+ }
+ }
+ device->codec_string[string_len] = '\0';
+ device->codec_order_last = n;
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</span><ins>+ "Codecs %s supported.\n", device->codec_string);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t skinny_handle_port_message(listener_t *listener, skinny_message_t *request)
+{
+ skinny_device_t *device = listener->device;
+
+ device->port = request->data.as_uint16;
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t skinny_handle_line_stat_request(listener_t *listener, skinny_message_t *request)
+{
+ skinny_device_t *device = listener->device;
+ skinny_message_t *message;
+ uint32_t i = 0;
+
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.line_res));
+ message->type = LINE_STAT_RES_MESSAGE;
+ message->length = 4 + sizeof(message->data.line_res);
+ i = request->data.line_req.number;
+ if(i > 0 && i <= device->line_last) {
+ message->data.line_res.number = i;
+ strcpy(message->data.line_res.name, device->line[i-1].name);
+ strcpy(message->data.line_res.shortname, device->line[i-1].shortname);
+ strcpy(message->data.line_res.displayname, device->line[i-1].displayname);
+ } else {
+ strcpy(message->data.line_res.name, "");
+ strcpy(message->data.line_res.shortname, "");
+ strcpy(message->data.line_res.displayname, "");
+ }
+ skinny_send_reply(listener, message);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t skinny_handle_keep_alive_message(listener_t *listener, skinny_message_t *request)
+{
+ skinny_message_t *message;
+
+ message = switch_core_alloc(listener->pool, 12);
+ message->type = KEEP_ALIVE_ACK_MESSAGE;
+ message->length = 4;
+ keepalive_listener(listener, NULL);
+ skinny_send_reply(listener, message);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request)
+{
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</ins><span class="cx"> "Received message (type=%x,length=%d).\n", request->type, request->length);
</span><span class="cx"> if(!listener->device && request->type != REGISTER_MESSAGE) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "Device should send a register message first.\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- device = listener->device;
</del><span class="cx"> switch(request->type) {
</span><span class="cx"> case REGISTER_MESSAGE:
</span><span class="cx"> return skinny_handle_register(listener, request);
</span><span class="cx"> case CAPABILITIES_RES_MESSAGE:
</span><del>- n = request->data.cap_res.count;
- if (n > SWITCH_MAX_CODECS) {
- n = SWITCH_MAX_CODECS;
- }
- string_len = -1;
- for (i = 0; i < n; i++) {
- char *codec = skinny_codec2string(request->data.cap_res.caps[i].codec);
- device->codec_order[i] = codec;
- string_len += strlen(codec)+1;
- }
- i = 0;
- pos = 0;
- device->codec_string = realloc(device->codec_string, string_len+1);
- for (string_pos = 0; string_pos < string_len; string_pos++) {
- char *codec = device->codec_order[i];
- switch_assert(i < n);
- if(pos == strlen(codec)) {
- device->codec_string[string_pos] = ',';
- i++;
- pos = 0;
- } else {
- device->codec_string[string_pos] = codec[pos++];
- }
- }
- device->codec_string[string_len] = '\0';
- device->codec_order_last = n;
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
- "Codecs %s supported.\n", device->codec_string);
</del><ins>+ return skinny_handle_capabilities_response(listener, request);
</ins><span class="cx"> case PORT_MESSAGE:
</span><del>- device->port = request->data.as_uint16;
- break;
</del><ins>+ return skinny_handle_port_message(listener, request);
</ins><span class="cx"> case LINE_STAT_REQ_MESSAGE:
</span><del>- message = switch_core_alloc(listener->pool, 12+sizeof(message->data.line_res));
- message->type = LINE_STAT_RES_MESSAGE;
- message->length = 4 + sizeof(message->data.line_res);
- i = request->data.line_req.number;
- if(i > 0 && i <= device->line_last) {
- message->data.line_res.number = i;
- strcpy(message->data.line_res.name, device->line[i-1].name);
- strcpy(message->data.line_res.shortname, device->line[i-1].shortname);
- strcpy(message->data.line_res.displayname, device->line[i-1].displayname);
- } else {
- strcpy(message->data.line_res.name, "");
- strcpy(message->data.line_res.shortname, "");
- strcpy(message->data.line_res.displayname, "");
- }
- skinny_send_reply(listener, message);
- break;
</del><ins>+ return skinny_handle_line_stat_request(listener, request);
</ins><span class="cx"> case KEEP_ALIVE_MESSAGE:
</span><del>- message = switch_core_alloc(listener->pool, 12);
- message->type = KEEP_ALIVE_ACK_MESSAGE;
- message->length = 4;
- keepalive_listener(listener, NULL);
- skinny_send_reply(listener, message);
- break;
- /* TODO */
</del><ins>+ return skinny_handle_keep_alive_message(listener, request);
</ins><span class="cx"> default:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><del>- "Unknown request type: %d.\n", request->type);
</del><ins>+ "Unknown request type: %x (length=%d).\n", request->type, request->length);
+ return SWITCH_STATUS_SUCCESS;
</ins><span class="cx"> }
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t skinny_send_reply(listener_t *listener, skinny_message_t *reply)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>