<!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][16777] </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=16777">16777</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:03:46 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Milestone 8: answer ConfigStatReqmessage with ConfigStatMessage
also some cleanup</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 (16776 => 16777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:03:04 UTC (rev 16776)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:03:46 UTC (rev 16777)
</span><span class="lines">@@ -175,12 +175,12 @@
</span><span class="cx"> /* RegisterMessage */
</span><span class="cx"> #define REGISTER_MESSAGE 0x0001
</span><span class="cx"> struct register_message {
</span><del>- char deviceName[16];
- uint32_t userId;
</del><ins>+ char device_name[16];
+ uint32_t user_id;
</ins><span class="cx"> uint32_t instance;
</span><span class="cx"> struct in_addr ip;
</span><del>- uint32_t deviceType;
- uint32_t maxStreams;
</del><ins>+ uint32_t device_type;
+ uint32_t max_streams;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* PortMessage */
</span><span class="lines">@@ -228,12 +228,8 @@
</span><span class="cx"> uint32_t number;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-/* CapabilitiesResMessage */
-struct station_capabilities {
- uint32_t codec;
- uint16_t frames;
- char reserved[10];
-};
</del><ins>+/* ConfigStatReqMessage */
+#define CONFIG_STAT_REQ_MESSAGE 0x000C
</ins><span class="cx">
</span><span class="cx"> /* TimeDateReqMessage */
</span><span class="cx"> #define TIME_DATE_REQ_MESSAGE 0x000D
</span><span class="lines">@@ -243,6 +239,12 @@
</span><span class="cx">
</span><span class="cx"> /* CapabilitiesResMessage */
</span><span class="cx"> #define CAPABILITIES_RES_MESSAGE 0x0010
</span><ins>+struct station_capabilities {
+ uint32_t codec;
+ uint16_t frames;
+ char reserved[10];
+};
+
</ins><span class="cx"> struct capabilities_res_message {
</span><span class="cx"> uint32_t count;
</span><span class="cx"> struct station_capabilities caps[SWITCH_MAX_CODECS];
</span><span class="lines">@@ -451,6 +453,18 @@
</span><span class="cx"> char displayname[44];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* ConfigStatMessage */
+#define CONFIG_STAT_RES_MESSAGE 0x0093
+struct config_stat_res_message {
+ char device_name[16];
+ uint32_t user_id;
+ uint32_t instance;
+ char user_name[40];
+ char server_name[40];
+ uint32_t number_lines;
+ uint32_t number_speed_dials;
+};
+
</ins><span class="cx"> /* DefineTimeDate */
</span><span class="cx"> #define DEFINE_TIME_DATE_MESSAGE 0x0094
</span><span class="cx"> struct define_time_date_message {
</span><span class="lines">@@ -656,6 +670,7 @@
</span><span class="cx"> struct call_info_message call_info;
</span><span class="cx"> struct speed_dial_stat_res_message speed_dial_res;
</span><span class="cx"> struct line_stat_res_message line_res;
</span><ins>+ struct config_stat_res_message config_res;
</ins><span class="cx"> struct define_time_date_message define_time_date;
</span><span class="cx"> struct button_template_message button_template;
</span><span class="cx"> struct register_rej_message reg_rej;
</span><span class="lines">@@ -1352,6 +1367,7 @@
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ tech_pvt->profile = profile;
</ins><span class="cx"> tech_pvt->dest = switch_core_session_strdup(nsession, dest);
</span><span class="cx"> snprintf(name, sizeof(name), "SKINNY/%s/%s", profile->name, dest);
</span><span class="cx">
</span><span class="lines">@@ -2001,10 +2017,10 @@
</span><span class="cx"> skinny_device_event(listener, &params, SWITCH_EVENT_REQUEST_PARAMS, SWITCH_EVENT_SUBCLASS_ANY);
</span><span class="cx"> switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "skinny-auth");
</span><span class="cx">
</span><del>- if (switch_xml_locate_user("id", request->data.reg.deviceName, profile->domain, "", &xroot, &xdomain, &xuser, &xgroup, params) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_xml_locate_user("id", request->data.reg.device_name, profile->domain, "", &xroot, &xdomain, &xuser, &xgroup, params) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find device [%s@%s]\n"
</span><span class="cx"> "You must define a domain called '%s' in your directory and add a user with id=\"%s\".\n"
</span><del>- , request->data.reg.deviceName, profile->domain, profile->domain, request->data.reg.deviceName);
</del><ins>+ , request->data.reg.device_name, profile->domain, profile->domain, request->data.reg.device_name);
</ins><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_rej));
</span><span class="cx"> message->type = REGISTER_REJ_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.reg_rej);
</span><span class="lines">@@ -2018,12 +2034,12 @@
</span><span class="cx"> "INSERT INTO skinny_devices "
</span><span class="cx"> "(name, user_id, instance, ip, type, max_streams, codec_string) "
</span><span class="cx"> "VALUES ('%s','%d','%d', '%s', '%d', '%d', '%s')",
</span><del>- request->data.reg.deviceName,
- request->data.reg.userId,
</del><ins>+ request->data.reg.device_name,
+ request->data.reg.user_id,
</ins><span class="cx"> request->data.reg.instance,
</span><span class="cx"> inet_ntoa(request->data.reg.ip),
</span><del>- request->data.reg.deviceType,
- request->data.reg.maxStreams,
</del><ins>+ request->data.reg.device_type,
+ request->data.reg.max_streams,
</ins><span class="cx"> "" /* codec_string */
</span><span class="cx"> ))) {
</span><span class="cx"> skinny_execute_sql(profile, sql, profile->listener_mutex);
</span><span class="lines">@@ -2031,7 +2047,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- strcpy(listener->device_name, request->data.reg.deviceName);
</del><ins>+ strcpy(listener->device_name, request->data.reg.device_name);
</ins><span class="cx">
</span><span class="cx"> xskinny = switch_xml_child(xuser, "skinny");
</span><span class="cx"> if (xskinny) {
</span><span class="lines">@@ -2047,7 +2063,7 @@
</span><span class="cx"> "INSERT INTO skinny_buttons "
</span><span class="cx"> "(device_name, position, type, label, value, settings) "
</span><span class="cx"> "VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
</span><del>- request->data.reg.deviceName,
</del><ins>+ request->data.reg.device_name,
</ins><span class="cx"> position,
</span><span class="cx"> type,
</span><span class="cx"> label,
</span><span class="lines">@@ -2099,6 +2115,60 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static int skinny_config_stat_res_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ skinny_message_t *message = pArg;
+ char *device_name = argv[0];
+ int user_id = atoi(argv[1]);
+ int instance = atoi(argv[2]);
+ char *user_name = argv[3];
+ char *server_name = argv[4];
+ int number_lines = atoi(argv[5]);
+ int number_speed_dials = atoi(argv[6]);
+
+ strcpy(message->data.config_res.device_name, device_name);
+ message->data.config_res.user_id = user_id;
+ message->data.config_res.instance = instance;
+ strcpy(message->data.config_res.user_name, user_name);
+ strcpy(message->data.config_res.server_name, server_name);
+ message->data.config_res.number_lines = number_lines;
+ message->data.config_res.number_speed_dials = number_speed_dials;
+
+ return 0;
+}
+
+static switch_status_t skinny_handle_config_stat_request(listener_t *listener, skinny_message_t *request)
+{
+ char *sql;
+ skinny_message_t *message;
+ skinny_profile_t *profile;
+
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ profile = listener->profile;
+
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.config_res));
+ message->type = CONFIG_STAT_RES_MESSAGE;
+ message->length = 4 + sizeof(message->data.config_res);
+
+ if ((sql = switch_mprintf(
+ "SELECT name, user_id, instance, '' AS user_name, '' AS server_name, "
+ "(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type='line') AS number_lines, "
+ "(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type='speed-dial') AS number_speed_dials "
+ "FROM skinny_devices WHERE name='%s' ",
+ listener->device_name,
+ listener->device_name,
+ listener->device_name
+ ))) {
+ skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_config_stat_res_callback, message);
+ switch_safe_free(sql);
+ }
+ skinny_send_reply(listener, message);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> static switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> char *sql;
</span><span class="lines">@@ -2472,6 +2542,8 @@
</span><span class="cx"> return skinny_handle_register(listener, request);
</span><span class="cx"> case HEADSET_STATUS_MESSAGE:
</span><span class="cx"> return skinny_headset_status_message(listener, request);
</span><ins>+ case CONFIG_STAT_REQ_MESSAGE:
+ return skinny_handle_config_stat_request(listener, request);
</ins><span class="cx"> case CAPABILITIES_RES_MESSAGE:
</span><span class="cx"> return skinny_handle_capabilities_response(listener, request);
</span><span class="cx"> case PORT_MESSAGE:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>