<!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][16823] </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=16823">16823</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-25 11:36:45 -0600 (Thu, 25 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: handle ServiceUrl</pre>
<h3>Modified Paths</h3>
<ul>
<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_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16822 => 16823)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-25 15:53:57 UTC (rev 16822)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-25 17:36:45 UTC (rev 16823)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
</span><span class="cx"> {"UnregisterMessage", UNREGISTER_MESSAGE},
</span><span class="cx"> {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
</span><ins>+ {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
</ins><span class="cx"> {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
</span><span class="cx"> {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
</span><span class="cx"> {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
</span><span class="lines">@@ -112,6 +113,7 @@
</span><span class="cx"> {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
</span><span class="cx"> {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
</span><span class="cx"> {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
</span><ins>+ {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
</ins><span class="cx"> {NULL, 0}
</span><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
</span><span class="lines">@@ -140,6 +142,8 @@
</span><span class="cx"> {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
</span><span class="cx"> {"Line", SKINNY_BUTTON_LINE},
</span><span class="cx"> {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
</span><ins>+ {"Privacy", SKINNY_BUTTON_PRIVACY},
+ {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
</ins><span class="cx"> {"Undefined", SKINNY_BUTTON_UNDEFINED},
</span><span class="cx"> {NULL, 0}
</span><span class="cx"> };
</span><span class="lines">@@ -723,6 +727,50 @@
</span><span class="cx"> *button = helper.button;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct service_url_get_helper {
+ uint32_t pos;
+ struct service_url_stat_res_message *button;
+};
+
+int skinny_service_url_get_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct service_url_get_helper *helper = pArg;
+
+ helper->pos++;
+ if (helper->pos == atoi(argv[0])) { /* wanted_position */
+ helper->button->index = helper->pos;
+ strncpy(helper->button->url, argv[3], 256); /* value */
+ strncpy(helper->button->display_name, argv[2], 40); /* label */
+ }
+ return 0;
+}
+
+void skinny_service_url_get(listener_t *listener, uint32_t instance, struct service_url_stat_res_message **button)
+{
+ struct service_url_get_helper helper = {0};
+ char *sql;
+
+ switch_assert(listener);
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
+
+ helper.button = switch_core_alloc(listener->pool, sizeof(struct service_url_stat_res_message));
+
+ if ((sql = switch_mprintf(
+ "SELECT '%d' AS wanted_position, position, label, value, settings "
+ "FROM skinny_buttons "
+ "WHERE device_name='%s' AND type=%d "
+ "ORDER BY position",
+ instance,
+ listener->device_name,
+ SKINNY_BUTTON_SERVICE_URL
+ ))) {
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_service_url_get_callback, &helper);
+ switch_safe_free(sql);
+ }
+ *button = helper.button;
+}
+
</ins><span class="cx"> struct feature_get_helper {
</span><span class="cx"> uint32_t pos;
</span><span class="cx"> struct feature_stat_res_message *button;
</span><span class="lines">@@ -756,11 +804,11 @@
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, settings "
</span><span class="cx"> "FROM skinny_buttons "
</span><del>- "WHERE device_name='%s' AND NOT (type=%d OR type=%d) "
</del><ins>+ "WHERE device_name='%s' AND NOT (type=%d OR type=%d OR type=%d) "
</ins><span class="cx"> "ORDER BY position",
</span><span class="cx"> instance,
</span><span class="cx"> listener->device_name,
</span><del>- SKINNY_BUTTON_LINE, SKINNY_BUTTON_SPEED_DIAL
</del><ins>+ SKINNY_BUTTON_LINE, SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL
</ins><span class="cx"> ))) {
</span><span class="cx"> skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper);
</span><span class="cx"> switch_safe_free(sql);
</span><span class="lines">@@ -1558,6 +1606,26 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+switch_status_t skinny_handle_service_url_stat_request(listener_t *listener, skinny_message_t *request)
+{
+ skinny_message_t *message;
+ struct service_url_stat_res_message *button = NULL;
+
+ skinny_check_data_length(request, sizeof(request->data.service_url_req));
+
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.service_url_res));
+ message->type = SERVICE_URL_STAT_RES_MESSAGE;
+ message->length = 4 + sizeof(message->data.service_url_res);
+
+ skinny_service_url_get(listener, request->data.service_url_req.service_url_index, &button);
+
+ memcpy(&message->data.service_url_res, button, sizeof(struct service_url_stat_res_message));
+
+ skinny_send_reply(listener, message);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> switch_status_t skinny_handle_feature_stat_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><span class="lines">@@ -2049,6 +2117,8 @@
</span><span class="cx"> return skinny_handle_line_stat_request(listener, request);
</span><span class="cx"> case SPEED_DIAL_STAT_REQ_MESSAGE:
</span><span class="cx"> return skinny_handle_speed_dial_stat_request(listener, request);
</span><ins>+ case SERVICE_URL_STAT_REQ_MESSAGE:
+ return skinny_handle_service_url_stat_request(listener, request);
</ins><span class="cx"> case FEATURE_STAT_REQ_MESSAGE:
</span><span class="cx"> return skinny_handle_feature_stat_request(listener, request);
</span><span class="cx"> case REGISTER_AVAILABLE_LINES_MESSAGE:
</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 (16822 => 16823)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-25 15:53:57 UTC (rev 16822)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-25 17:36:45 UTC (rev 16823)
</span><span class="lines">@@ -159,6 +159,12 @@
</span><span class="cx"> /* SoftKeyTemplateReqMessage */
</span><span class="cx"> #define SOFT_KEY_TEMPLATE_REQ_MESSAGE 0x0028
</span><span class="cx">
</span><ins>+/* ServiceUrlStatReqMessage */
+#define SERVICE_URL_STAT_REQ_MESSAGE 0x0033
+struct service_url_stat_req_message {
+ uint32_t service_url_index;
+};
+
</ins><span class="cx"> /* FeatureStatReqMessage */
</span><span class="cx"> #define FEATURE_STAT_REQ_MESSAGE 0x0034
</span><span class="cx"> struct feature_stat_req_message {
</span><span class="lines">@@ -464,6 +470,13 @@
</span><span class="cx"> uint32_t status;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* ServiceUrlStatMessage */
+#define SERVICE_URL_STAT_RES_MESSAGE 0x012F
+struct service_url_stat_res_message {
+ uint32_t index;
+ char url[256];
+ char display_name[40];
+};
</ins><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SKINNY MESSAGE */
</span><span class="lines">@@ -484,6 +497,7 @@
</span><span class="cx"> struct alarm_message alarm;
</span><span class="cx"> struct open_receive_channel_ack_message open_receive_channel_ack;
</span><span class="cx"> struct soft_key_event_message soft_key_event;
</span><ins>+ struct service_url_stat_req_message service_url_req;
</ins><span class="cx"> struct feature_stat_req_message feature_req;
</span><span class="cx"> struct headset_status_message headset_status;
</span><span class="cx"> struct register_available_lines_message reg_lines;
</span><span class="lines">@@ -515,6 +529,7 @@
</span><span class="cx"> struct unregister_ack_message unregister_ack;
</span><span class="cx"> struct dialed_number_message dialed_number;
</span><span class="cx"> struct feature_stat_res_message feature_res;
</span><ins>+ struct service_url_stat_res_message service_url_res;
</ins><span class="cx">
</span><span class="cx"> uint16_t as_uint16;
</span><span class="cx"> char as_char;
</span><span class="lines">@@ -626,7 +641,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[53];
</del><ins>+struct skinny_table SKINNY_MESSAGE_TYPES[55];
</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 class="lines">@@ -694,9 +709,11 @@
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL = 0x02,
</span><span class="cx"> SKINNY_BUTTON_LINE = 0x09,
</span><span class="cx"> SKINNY_BUTTON_VOICEMAIL = 0x0F,
</span><ins>+ SKINNY_BUTTON_PRIVACY = 0x13,
+ SKINNY_BUTTON_SERVICE_URL = 0x14,
</ins><span class="cx"> SKINNY_BUTTON_UNDEFINED = 0xFF,
</span><span class="cx"> };
</span><del>-struct skinny_table SKINNY_BUTTONS[6];
</del><ins>+struct skinny_table SKINNY_BUTTONS[8];
</ins><span class="cx"> const char *skinny_button2str(uint32_t id);
</span><span class="cx"> uint32_t skinny_str2button(const char *str);
</span><span class="cx"> #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>