<!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][16753] </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=16753">16753</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 05:58:36 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Milestone 1 : device level (CapabilitiesReqMessage and CapabilitiesResMessage)
- send CapabilitiesReqMessage during registration
- handle CapabilitiesResMessage
- also correct sent length</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 (16752 => 16753)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:58:25 UTC (rev 16752)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 11:58:36 UTC (rev 16753)
</span><span class="lines">@@ -103,11 +103,13 @@
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-/* SKINNY TYPES */
</del><ins>+/* SKINNY MESSAGES */
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><ins>+/* KeepAliveMessage */
</ins><span class="cx"> #define KEEP_ALIVE_MESSAGE 0x0000
</span><span class="cx">
</span><ins>+/* RegisterMessage */
</ins><span class="cx"> #define REGISTER_MESSAGE 0x0001
</span><span class="cx"> struct register_message {
</span><span class="cx"> char deviceName[16];
</span><span class="lines">@@ -118,8 +120,23 @@
</span><span class="cx"> uint32_t maxStreams;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* IpPortMessage */
</ins><span class="cx"> #define PORT_MESSAGE 0x0002
</span><span class="cx">
</span><ins>+/* CapabilitiesResMessage */
+struct station_capabilities {
+ uint32_t codec;
+ uint16_t frames;
+ char reserved[10];
+};
+
+#define CAPABILITIES_RES_MESSAGE 0x0010
+struct capabilities_res_message {
+ uint32_t count;
+ struct station_capabilities caps[SWITCH_MAX_CODECS];
+};
+
+/* RegisterAckMessage */
</ins><span class="cx"> #define REGISTER_ACK_MESSAGE 0x0081
</span><span class="cx"> struct register_ack_message {
</span><span class="cx"> uint32_t keepAlive;
</span><span class="lines">@@ -129,8 +146,16 @@
</span><span class="cx"> char reserved2[4];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* CapabilitiesReqMessage */
+#define CAPABILITIES_REQ_MESSAGE 0x009B
+
+/* KeepAliveAckMessage */
</ins><span class="cx"> #define KEEP_ALIVE_ACK_MESSAGE 0x0100
</span><span class="cx">
</span><ins>+/*****************************************************************************/
+/* SKINNY TYPES */
+/*****************************************************************************/
+
</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">@@ -138,6 +163,7 @@
</span><span class="cx"> union skinny_data {
</span><span class="cx"> struct register_message reg;
</span><span class="cx"> struct register_ack_message reg_ack;
</span><ins>+ struct capabilities_res_message cap_res;
</ins><span class="cx">
</span><span class="cx"> uint16_t as_uint16;
</span><span class="cx"> char as_char;
</span><span class="lines">@@ -160,12 +186,27 @@
</span><span class="cx"> struct in_addr ip;
</span><span class="cx"> uint32_t deviceType;
</span><span class="cx"> uint32_t maxStreams;
</span><ins>+
</ins><span class="cx"> uint16_t port;
</span><ins>+
+ char *codec_string;
+ char *codec_order[SWITCH_MAX_CODECS];
+ int codec_order_last;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct skinny_device skinny_device_t;
</span><span class="cx">
</span><span class="cx"> typedef switch_status_t (*skinny_command_t) (char **argv, int argc, switch_stream_handle_t *stream);
</span><span class="cx">
</span><ins>+enum skinny_codecs {
+ SKINNY_CODEC_ALAW = 2,
+ SKINNY_CODEC_ULAW = 4,
+ SKINNY_CODEC_G723_1 = 9,
+ SKINNY_CODEC_G729A = 12,
+ SKINNY_CODEC_G726_32 = 82,
+ SKINNY_CODEC_H261 = 100,
+ SKINNY_CODEC_H263 = 101
+};
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* LISTENERS TYPES */
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -220,6 +261,10 @@
</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>+
+/* SKINNY FUNCTIONS */
+static switch_status_t skinny_send_reply(listener_t *listener, skinny_message_t *reply);
+
</ins><span class="cx"> /* LISTENER FUNCTIONS */
</span><span class="cx"> static switch_status_t keepalive_listener(listener_t *listener, void *pvt);
</span><span class="cx">
</span><span class="lines">@@ -621,6 +666,28 @@
</span><span class="cx"> /* SKINNY FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><ins>+static char* skinny_codec2string(enum skinny_codecs skinnycodec)
+{
+ switch (skinnycodec) {
+ case SKINNY_CODEC_ALAW:
+ return "ALAW";
+ case SKINNY_CODEC_ULAW:
+ return "ULAW";
+ case SKINNY_CODEC_G723_1:
+ return "G723_1";
+ case SKINNY_CODEC_G729A:
+ return "G729A";
+ case SKINNY_CODEC_G726_32:
+ return "G726_AAL2";
+ case SKINNY_CODEC_H261:
+ return "H261";
+ case SKINNY_CODEC_H263:
+ return "H263";
+ default:
+ return "";
+ }
+}
+
</ins><span class="cx"> static switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *request;
</span><span class="lines">@@ -702,8 +769,11 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t skinny_parse_request(listener_t *listener, skinny_message_t *request, skinny_message_t **rep)
</span><span class="cx"> {
</span><del>- skinny_message_t *reply;
</del><ins>+ skinny_message_t *reply, *message;
</ins><span class="cx"> skinny_device_t *device;
</span><ins>+ uint32_t i = 0;
+ uint32_t n = 0;
+ size_t string_len, string_pos, pos;
</ins><span class="cx"> reply = NULL;
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</span><span class="cx"> "Received message of type %d.\n", request->type);
</span><span class="lines">@@ -721,6 +791,7 @@
</span><span class="cx"> "Device already registred.\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+ /* Initialize device */
</ins><span class="cx"> device = switch_core_alloc(listener->pool, sizeof(skinny_device_t));
</span><span class="cx"> memcpy(device->deviceName, request->data.reg.deviceName, 16);
</span><span class="cx"> device->userId = request->data.reg.userId;
</span><span class="lines">@@ -728,18 +799,56 @@
</span><span class="cx"> device->ip = request->data.reg.ip;
</span><span class="cx"> device->deviceType = request->data.reg.deviceType;
</span><span class="cx"> device->maxStreams = request->data.reg.maxStreams;
</span><ins>+ device->codec_string = realloc(device->codec_string, 1);
+ device->codec_string[0] = '\0';
</ins><span class="cx"> listener->device = device;
</span><span class="cx">
</span><ins>+ /* Reply with RegisterAckMessage */
</ins><span class="cx"> reply = switch_core_alloc(listener->pool, 12+sizeof(reply->data.reg_ack));
</span><span class="cx"> reply->type = REGISTER_ACK_MESSAGE;
</span><span class="cx"> reply->length = 4 + sizeof(reply->data.reg_ack);
</span><span class="cx"> reply->data.reg_ack.keepAlive = globals.keep_alive;
</span><span class="cx"> memcpy(reply->data.reg_ack.dateFormat, globals.date_format, 6);
</span><span class="cx"> reply->data.reg_ack.secondaryKeepAlive = globals.keep_alive;
</span><del>- /* TODO send CapabilitiesReqMessage (and parse the CapabilitiesResMessage) */
</del><ins>+
+ /* Send CapabilitiesReqMessage */
+ message = switch_core_alloc(listener->pool, 12);
+ message->type = CAPABILITIES_REQ_MESSAGE;
+ message->length = 4;
+ skinny_send_reply(listener, message);
+
</ins><span class="cx"> /* TODO event */
</span><span class="cx"> keepalive_listener(listener, NULL);
</span><span class="cx"> break;
</span><ins>+ case CAPABILITIES_RES_MESSAGE:
+ 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);
</ins><span class="cx"> case PORT_MESSAGE:
</span><span class="cx"> device->port = request->data.as_uint16;
</span><span class="cx"> break;
</span><span class="lines">@@ -763,7 +872,7 @@
</span><span class="cx"> char *ptr;
</span><span class="cx"> switch_size_t len;
</span><span class="cx"> switch_assert(reply != NULL);
</span><del>- len = reply->length+4;
</del><ins>+ len = reply->length+8;
</ins><span class="cx"> ptr = (char *) reply;
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Sending reply (length=%d).\n", len);
</span><span class="cx"> switch_socket_send(listener->sock, ptr, &len);
</span><span class="lines">@@ -864,6 +973,7 @@
</span><span class="cx"> stream->write_function(stream, "DeviceType \t%d\n", device->deviceType);
</span><span class="cx"> stream->write_function(stream, "MaxStreams \t%d\n", device->maxStreams);
</span><span class="cx"> stream->write_function(stream, "Port \t%d\n", device->port);
</span><ins>+ stream->write_function(stream, "Codecs \t%s\n", device->codec_string);
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>