<!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][16770] </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=16770">16770</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:00:55 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Milestone 5: Speed-dials
- answer SpeedDialStatReqMessage with SpeedDialStatMessage</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 (16769 => 16770)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:00:45 UTC (rev 16769)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:00:55 UTC (rev 16770)
</span><span class="lines">@@ -181,6 +181,11 @@
</span><span class="cx"> /* IpPortMessage */
</span><span class="cx"> #define PORT_MESSAGE 0x0002
</span><span class="cx">
</span><ins>+#define SPEED_DIAL_STAT_REQ_MESSAGE 0x000A
+struct speed_dial_stat_req_message {
+ uint32_t number;
+};
+
</ins><span class="cx"> /* LineStatReqMessage */
</span><span class="cx"> #define LINE_STAT_REQ_MESSAGE 0x000B
</span><span class="cx"> struct line_stat_req_message {
</span><span class="lines">@@ -237,6 +242,14 @@
</span><span class="cx"> char reserved2[4];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* SpeedDialStatMessage */
+#define SPEED_DIAL_STAT_RES_MESSAGE 0x0091
+struct speed_dial_stat_res_message {
+ uint32_t number;
+ char line[24];
+ char label[40];
+};
+
</ins><span class="cx"> /* LineStatMessage */
</span><span class="cx"> #define LINE_STAT_RES_MESSAGE 0x0092
</span><span class="cx"> struct line_stat_res_message {
</span><span class="lines">@@ -311,9 +324,11 @@
</span><span class="cx"> struct register_message reg;
</span><span class="cx"> struct register_available_lines_message reg_lines;
</span><span class="cx"> struct register_ack_message reg_ack;
</span><ins>+ struct speed_dial_stat_req_message speed_dial_req;
</ins><span class="cx"> struct line_stat_req_message line_req;
</span><span class="cx"> struct capabilities_res_message cap_res;
</span><span class="cx"> struct alarm_message alarm;
</span><ins>+ struct speed_dial_stat_res_message speed_dial_res;
</ins><span class="cx"> struct line_stat_res_message line_res;
</span><span class="cx"> struct button_template_message button_template;
</span><span class="cx"> struct register_rej_message reg_rej;
</span><span class="lines">@@ -1577,6 +1592,52 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+static int skinny_handle_speed_dial_request_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ skinny_message_t *message = pArg;
+
+ message->data.speed_dial_res.number++;
+ if (message->data.speed_dial_res.number == atoi(argv[0])) { /* wanted_position */
+ message->data.speed_dial_res.number = atoi(argv[3]); /* value */
+ strcpy(message->data.speed_dial_res.label, argv[2]); /* label */
+ }
+ return 0;
+}
+
+static switch_status_t skinny_handle_speed_dial_request(listener_t *listener, skinny_message_t *request)
+{
+ skinny_message_t *message;
+ skinny_profile_t *profile;
+ char *sql;
+
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
+ skinny_check_data_length(request, sizeof(request->data.speed_dial_req));
+
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.speed_dial_res));
+ message->type = SPEED_DIAL_STAT_RES_MESSAGE;
+ message->length = 4 + sizeof(message->data.speed_dial_res);
+ message->data.speed_dial_res.number = 0;
+ if ((sql = switch_mprintf(
+ "SELECT '%d' AS wanted_position, position, label, value, settings "
+ "FROM skinny_buttons WHERE device_name='%s' AND type='speed-dial' "
+ "ORDER BY position",
+ request->data.speed_dial_req.number,
+ listener->device_name
+ ))) {
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_speed_dial_request_callback, message);
+ switch_safe_free(sql);
+ }
+ message->data.speed_dial_res.number = request->data.speed_dial_req.number;
+ skinny_send_reply(listener, message);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> static switch_status_t skinny_handle_register_available_lines_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.reg_lines));
</span><span class="lines">@@ -1633,6 +1694,8 @@
</span><span class="cx"> return skinny_handle_soft_key_set_request(listener, request);
</span><span class="cx"> case LINE_STAT_REQ_MESSAGE:
</span><span class="cx"> return skinny_handle_line_stat_request(listener, request);
</span><ins>+ case SPEED_DIAL_STAT_REQ_MESSAGE:
+ return skinny_handle_speed_dial_request(listener, request);
</ins><span class="cx"> case REGISTER_AVAILABLE_LINES_MESSAGE:
</span><span class="cx"> return skinny_handle_register_available_lines_message(listener, request);
</span><span class="cx"> case KEEP_ALIVE_MESSAGE:
</span><span class="lines">@@ -1735,7 +1798,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_stream_handle_t *stream = (switch_stream_handle_t *) pArg;
</span><span class="cx">
</span><del>- char *name = argv[0];
</del><ins>+ char *device_name = argv[0];
</ins><span class="cx"> char *user_id = argv[1];
</span><span class="cx"> char *instance = argv[2];
</span><span class="cx"> char *ip = argv[3];
</span><span class="lines">@@ -1746,7 +1809,7 @@
</span><span class="cx">
</span><span class="cx"> const char *line = "=================================================================================================";
</span><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><del>- stream->write_function(stream, "DeviceName \t%s\n", switch_str_nil(name));
</del><ins>+ stream->write_function(stream, "DeviceName \t%s\n", switch_str_nil(device_name));
</ins><span class="cx"> stream->write_function(stream, "UserId \t%s\n", user_id);
</span><span class="cx"> stream->write_function(stream, "Instance \t%s\n", instance);
</span><span class="cx"> stream->write_function(stream, "IP \t%s\n", ip);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>