<!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][16790] </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=16790">16790</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:05:56 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: Rework of buttons
- Refactorize line/speed-dial info (with getters)
- Set calling/called party when known
- Don't recreate session on existing
- Lower some debug messages (SQL, messages send/received)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h</a></li>
<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_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16789 => 16790)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:45 UTC (rev 16789)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:56 UTC (rev 16790)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "SQL: %s\n", sql);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", sql);
</ins><span class="cx"> switch_core_db_persistant_execute(db, sql, 1);
</span><span class="cx"> switch_core_db_close(db);
</span><span class="cx"> }
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "SQL: %s\n", sql);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", sql);
</ins><span class="cx"> switch_core_db_exec(db, sql, callback, pdata, &errmsg);
</span><span class="cx">
</span><span class="cx"> if (errmsg) {
</span><span class="lines">@@ -334,9 +334,11 @@
</span><span class="cx"> tech_pvt->read_impl.microseconds_per_packet,
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet
</span><span class="cx"> ) != SWITCH_STATUS_SUCCESS) {
</span><del>- /* TODO
- switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
- */
</del><ins>+ switch_channel_t *channel = NULL;
+ channel = switch_core_session_get_channel(tech_pvt->session);
+ assert(channel != NULL);
+
+ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -383,6 +385,8 @@
</span><span class="cx">
</span><span class="cx"> void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line)
</span><span class="cx"> {
</span><ins>+ struct line_stat_res_message *button = NULL;
+
</ins><span class="cx"> switch_assert(tech_pvt);
</span><span class="cx"> switch_assert(session);
</span><span class="cx"> switch_assert(listener);
</span><span class="lines">@@ -396,6 +400,11 @@
</span><span class="cx"> tech_pvt->line = line;
</span><span class="cx"> switch_core_session_set_private(session, tech_pvt);
</span><span class="cx"> tech_pvt->session = session;
</span><ins>+
+ skinny_line_get(listener, line, &button);
+ tech_pvt->line_name = switch_core_strdup(listener->pool, button->name);
+ tech_pvt->line_shortname = switch_core_strdup(listener->pool, button->shortname);
+ tech_pvt->line_displayname = switch_core_strdup(listener->pool, button->displayname);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h (16789 => 16790)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-02-24 12:05:45 UTC (rev 16789)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-02-24 12:05:56 UTC (rev 16790)
</span><span class="lines">@@ -164,6 +164,9 @@
</span><span class="cx"> uint32_t line;
</span><span class="cx"> uint32_t call_id;
</span><span class="cx"> uint32_t party_id;
</span><ins>+ char *line_name;
+ char *line_shortname;
+ char *line_displayname;
</ins><span class="cx"> char dest[10];
</span><span class="cx"> /* codec */
</span><span class="cx"> char *iananame;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16789 => 16790)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:45 UTC (rev 16789)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:56 UTC (rev 16790)
</span><span class="lines">@@ -405,32 +405,52 @@
</span><span class="cx"> switch_status_t skinny_send_call_info(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt;
</span><ins>+ switch_channel_t *channel;
</ins><span class="cx"> listener_t *listener;
</span><span class="cx">
</span><ins>+ char calling_party_name[40] = "UNKNOWN";
+ char calling_party[24] = "0000000000";
+ char called_party_name[40] = "UNKNOWN";
+ char called_party[24] = "0000000000";
+
</ins><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><del>-
</del><ins>+ channel = switch_core_session_get_channel(session);
+ switch_assert(channel != NULL);
+
</ins><span class="cx"> listener = tech_pvt->listener;
</span><span class="cx"> switch_assert(listener != NULL);
</span><span class="cx">
</span><ins>+ switch_assert(tech_pvt->caller_profile != NULL);
+
+ if( switch_channel_test_flag(channel, CF_OUTBOUND) ) {
+ strncpy(calling_party_name, tech_pvt->line_displayname, 40);
+ strncpy(calling_party, tech_pvt->line_name, 24);
+ strncpy(called_party_name, tech_pvt->caller_profile->caller_id_name, 40);
+ strncpy(called_party, tech_pvt->caller_profile->caller_id_number, 24);
+ } else {
+ strncpy(calling_party_name, tech_pvt->caller_profile->caller_id_name, 40);
+ strncpy(calling_party, tech_pvt->caller_profile->caller_id_number, 24);
+ /* TODO called party */
+ }
</ins><span class="cx"> send_call_info(tech_pvt->listener,
</span><del>- "TODO", /* char calling_party_name[40], */
- "TODO", /* char calling_party[24], */
- "TODO", /* char called_party_name[40], */
- "TODO", /* char called_party[24], */
</del><ins>+ calling_party_name, /* char calling_party_name[40], */
+ calling_party, /* char calling_party[24], */
+ called_party_name, /* char called_party_name[40], */
+ called_party, /* char called_party[24], */
</ins><span class="cx"> tech_pvt->line, /* uint32_t line_instance, */
</span><span class="cx"> tech_pvt->call_id, /* uint32_t call_id, */
</span><span class="cx"> SKINNY_OUTBOUND_CALL, /* uint32_t call_type, */
</span><del>- "TODO", /* char original_called_party_name[40], */
- "TODO", /* char original_called_party[24], */
- "TODO", /* char last_redirecting_party_name[40], */
- "TODO", /* char last_redirecting_party[24], */
- 0, /* uint32_t original_called_party_redirect_reason, */
- 0, /* uint32_t last_redirecting_reason, */
- "TODO", /* char calling_party_voice_mailbox[24], */
- "TODO", /* char called_party_voice_mailbox[24], */
- "TODO", /* char original_called_party_voice_mailbox[24], */
- "TODO", /* char last_redirecting_voice_mailbox[24], */
</del><ins>+ "", /* TODO char original_called_party_name[40], */
+ "", /* TODO char original_called_party[24], */
+ "", /* TODO char last_redirecting_party_name[40], */
+ "", /* TODO char last_redirecting_party[24], */
+ 0, /* TODO uint32_t original_called_party_redirect_reason, */
+ 0, /* TODO uint32_t last_redirecting_reason, */
+ "", /* TODO char calling_party_voice_mailbox[24], */
+ "", /* TODO char called_party_voice_mailbox[24], */
+ "", /* TODO char original_called_party_voice_mailbox[24], */
+ "", /* TODO char last_redirecting_voice_mailbox[24], */
</ins><span class="cx"> 1, /* uint32_t call_instance, */
</span><span class="cx"> 1, /* uint32_t call_security_status, */
</span><span class="cx"> 0 /* uint32_t party_pi_restriction_bits */
</span><span class="lines">@@ -444,42 +464,55 @@
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> private_t *tech_pvt;
</span><del>- char *cid_name = "TODO-soft_key_event"; /* TODO set form the line*/
- char *cid_num = "00000"; /* TODO set form the line */
</del><span class="cx"> char name[128];
</span><span class="cx">
</span><del>- if (!(session = switch_core_session_request(skinny_get_endpoint_interface(), SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
- goto error;
- }
</del><ins>+ if(listener->session[line]) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "There is already a session on line %d of device %s\n",
+ line, listener->device_name);
</ins><span class="cx">
</span><del>- if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(*tech_pvt)))) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session private object\n");
- goto error;
- }
</del><ins>+ session = listener->session[line];
</ins><span class="cx">
</span><del>- switch_core_session_add_stream(session, NULL);
</del><ins>+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
</ins><span class="cx">
</span><del>- tech_init(tech_pvt, session, listener, line);
</del><ins>+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+ } else {
+
+ if (!(session = switch_core_session_request(skinny_get_endpoint_interface(), SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
</del><ins>+ if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(*tech_pvt)))) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session private object\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- snprintf(name, sizeof(name), "SKINNY/%s/%s/%d", listener->profile->name, listener->device_name, tech_pvt->line);
- switch_channel_set_name(channel, name);
</del><ins>+ switch_core_session_add_stream(session, NULL);
</ins><span class="cx">
</span><del>- if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session thread\n");
- goto error;
- }
</del><ins>+ tech_init(tech_pvt, session, listener, line);
</ins><span class="cx">
</span><del>- if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
- NULL, listener->profile->dialplan, cid_name, cid_num, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->context, tech_pvt->dest)) != 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session caller profile\n");
- goto error;
- }
</del><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</del><ins>+ snprintf(name, sizeof(name), "SKINNY/%s/%s/%d", listener->profile->name, listener->device_name, tech_pvt->line);
+ switch_channel_set_name(channel, name);
</ins><span class="cx">
</span><ins>+ if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session thread\n");
+ goto error;
+ }
+
+ if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
+ NULL, listener->profile->dialplan, tech_pvt->line_displayname, tech_pvt->line_name, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->context, tech_pvt->dest)) != 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session caller profile\n");
+ goto error;
+ }
+
+ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
+
+ }
+
</ins><span class="cx"> set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
</span><span class="cx"> set_speaker_mode(listener, SKINNY_SPEAKER_ON);
</span><span class="cx"> set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_ON);
</span><span class="lines">@@ -569,44 +602,96 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct speed_dial_get_dest_helper {
</del><ins>+/*****************************************************************************/
+/* SKINNY BUTTONS */
+/*****************************************************************************/
+struct line_get_helper {
</ins><span class="cx"> uint32_t pos;
</span><del>- char dest[40];
</del><ins>+ struct line_stat_res_message *button;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-int skinny_speed_dial_get_dest_callback(void *pArg, int argc, char **argv, char **columnNames)
</del><ins>+int skinny_line_get_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><del>- struct speed_dial_get_dest_helper *helper = pArg;
</del><ins>+ struct line_get_helper *helper = pArg;
</ins><span class="cx">
</span><span class="cx"> helper->pos++;
</span><span class="cx"> if (helper->pos == atoi(argv[0])) { /* wanted_position */
</span><del>- strncpy(helper->dest, argv[3], 40); /* value */
</del><ins>+ helper->button->number = helper->pos;
+ strncpy(helper->button->name, argv[2], 24); /* label */
+ strncpy(helper->button->shortname, argv[3], 40); /* value */
+ strncpy(helper->button->displayname, argv[2], 44); /* settings */
</ins><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void skinny_speed_dial_get_dest(skinny_profile_t *profile, const char *device_name, uint32_t instance, char *dest)
</del><ins>+void skinny_line_get(listener_t *listener, uint32_t instance, struct line_stat_res_message **button)
</ins><span class="cx"> {
</span><del>- struct speed_dial_get_dest_helper helper = {0};
</del><ins>+ struct line_get_helper helper = {0};
</ins><span class="cx"> char *sql;
</span><span class="cx">
</span><del>- switch_assert(device_name);
</del><ins>+ switch_assert(listener);
+ switch_assert(listener->profile);
+ switch_assert(listener->device_name);
</ins><span class="cx">
</span><ins>+ helper.button = switch_core_alloc(listener->pool, sizeof(struct line_stat_res_message));
+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, settings "
</span><ins>+ "FROM skinny_buttons WHERE device_name='%s' AND type='line' "
+ "ORDER BY position",
+ instance,
+ listener->device_name
+ ))) {
+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_line_get_callback, &helper);
+ switch_safe_free(sql);
+ }
+ *button = helper.button;
+}
+
+struct speed_dial_get_helper {
+ uint32_t pos;
+ struct speed_dial_stat_res_message *button;
+};
+
+int skinny_speed_dial_get_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct speed_dial_get_helper *helper = pArg;
+
+ helper->pos++;
+ if (helper->pos == atoi(argv[0])) { /* wanted_position */
+ helper->button->number = helper->pos; /* value */
+ strncpy(helper->button->line, argv[3], 24); /* value */
+ strncpy(helper->button->label, argv[2], 40); /* label */
+ }
+ return 0;
+}
+
+void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed_dial_stat_res_message **button)
+{
+ struct speed_dial_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 speed_dial_stat_res_message));
+
+ if ((sql = switch_mprintf(
+ "SELECT '%d' AS wanted_position, position, label, value, settings "
</ins><span class="cx"> "FROM skinny_buttons WHERE device_name='%s' AND type='speed-dial' "
</span><span class="cx"> "ORDER BY position",
</span><span class="cx"> instance,
</span><del>- device_name
</del><ins>+ listener->device_name
</ins><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_speed_dial_get_dest_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_speed_dial_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><del>- strncpy(dest, helper.dest, 40);
</del><ins>+ *button = helper.button;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-/* SKINNY MESSAGE HELPER */
</del><ins>+/* SKINNY MESSAGE SENDER */
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> switch_status_t start_tone(listener_t *listener,
</span><span class="cx"> uint32_t tone,
</span><span class="lines">@@ -1345,94 +1430,41 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skinny_line_stat_request_callback(void *pArg, int argc, char **argv, char **columnNames)
-{
- skinny_message_t *message = pArg;
-
- message->data.line_res.number++;
- if (message->data.line_res.number == atoi(argv[0])) { /* wanted_position */
- strncpy(message->data.line_res.name, argv[2], 24); /* label */
- strncpy(message->data.line_res.shortname, argv[3], 40); /* value */
- strncpy(message->data.line_res.displayname, argv[4], 44); /* settings */
- }
- return 0;
-}
-
</del><span class="cx"> switch_status_t skinny_handle_line_stat_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><del>- skinny_profile_t *profile;
- char *sql;
</del><ins>+ struct line_stat_res_message *button = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.line_req));
</span><span class="cx">
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.line_res));
</span><span class="cx"> message->type = LINE_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.line_res);
</span><del>- message->data.line_res.number = 0;
</del><ins>+
+ skinny_line_get(listener, request->data.line_req.number, &button);
</ins><span class="cx">
</span><del>- if ((sql = switch_mprintf(
- "SELECT '%d' AS wanted_position, position, label, value, settings "
- "FROM skinny_buttons WHERE device_name='%s' AND type='line' "
- "ORDER BY position",
- request->data.line_req.number,
- listener->device_name
- ))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_line_stat_request_callback, message);
- switch_safe_free(sql);
- }
- message->data.line_res.number = request->data.line_req.number;
</del><ins>+ memcpy(&message->data.line_res, button, sizeof(struct line_stat_res_message));
+
</ins><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-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 */
- strncpy(message->data.speed_dial_res.line, argv[3], 24); /* value */
- strncpy(message->data.speed_dial_res.label, argv[2], 40); /* label */
- }
- return 0;
-}
-
</del><span class="cx"> switch_status_t skinny_handle_speed_dial_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><del>- skinny_profile_t *profile;
- char *sql;
</del><ins>+ struct speed_dial_stat_res_message *button = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.speed_dial_req));
</span><span class="cx">
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.speed_dial_res));
</span><span class="cx"> message->type = SPEED_DIAL_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.speed_dial_res);
</span><del>- 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;
</del><ins>+
+ skinny_speed_dial_get(listener, request->data.speed_dial_req.number, &button);
+
+ memcpy(&message->data.speed_dial_res, button, sizeof(struct speed_dial_stat_res_message));
+
</ins><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1557,9 +1589,9 @@
</span><span class="cx"> switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_profile_t *profile;
</span><ins>+ struct speed_dial_stat_res_message *button = NULL;
</ins><span class="cx"> uint32_t line = 1;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><del>- char dest[40] = "";
</del><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="lines">@@ -1579,16 +1611,17 @@
</span><span class="cx"> skinny_process_dest(listener, line);
</span><span class="cx"> break;
</span><span class="cx"> case SKINNY_BUTTON_SPEED_DIAL:
</span><del>- skinny_speed_dial_get_dest(listener->profile, listener->device_name, request->data.stimulus.instance, dest);
- if(strlen(dest) > 0) {
</del><ins>+ skinny_speed_dial_get(listener, request->data.stimulus.instance, &button);
+ if(strlen(button->line) > 0) {
</ins><span class="cx"> skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
</span><span class="cx">
</span><span class="cx"> tech_pvt = switch_core_session_get_private(listener->session[line]);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- strcpy(tech_pvt->dest, dest);
</del><ins>+ strcpy(tech_pvt->dest, button->line);
</ins><span class="cx"> skinny_process_dest(listener, line);
</span><span class="cx"> }
</span><ins>+ break;
</ins><span class="cx"> default:
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown Stimulus Type Received [%d]\n", request->data.stimulus.instance_type);
</span><span class="cx"> }
</span><span class="lines">@@ -1799,7 +1832,7 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Received %s (type=%x,length=%d).\n", skinny_message_type2str(request->type), request->type, request->length);
</span><span class="cx"> if(zstr(listener->device_name) && request->type != REGISTER_MESSAGE && request->type != ALARM_MESSAGE) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</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 (16789 => 16790)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:05:45 UTC (rev 16789)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:05:56 UTC (rev 16790)
</span><span class="lines">@@ -669,6 +669,9 @@
</span><span class="cx"> switch_status_t skinny_process_dest(listener_t *listener, uint32_t line);
</span><span class="cx"> switch_status_t skinny_answer(switch_core_session_t *session);
</span><span class="cx">
</span><ins>+void skinny_line_get(listener_t *listener, uint32_t instance, struct line_stat_res_message **button);
+void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed_dial_stat_res_message **button);
+
</ins><span class="cx"> switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply);
</span><span class="cx"> #define skinny_send_reply(listener, reply) skinny_perform_send_reply(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply)
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>