kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-27 12:56:15 +00:00
Code Issues Projects Releases Wiki Activity

Skinny: handle ServiceUrl

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16823 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Parent 2010-02-25 17:36:45 +00:00
parent 60e8100b48
commit 05048ba11f
2 changed files with 91 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/mod/endpoints/mod_skinny/skinny_protocol.c
View File

@ -79,6 +79,7 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
{"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE}, {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
{"UnregisterMessage", UNREGISTER_MESSAGE}, {"UnregisterMessage", UNREGISTER_MESSAGE},
{"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE}, {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
{"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
{"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE}, {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
{"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE}, {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
{"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE}, {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
@ -112,6 +113,7 @@ struct skinny_table SKINNY_MESSAGE_TYPES[] = {
{"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE}, {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
{"DialedNumberMessage", DIALED_NUMBER_MESSAGE}, {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
{"FeatureResMessage", FEATURE_STAT_RES_MESSAGE}, {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
{"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
{NULL, 0} {NULL, 0}
}; };
SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage") SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
@ -140,6 +142,8 @@ struct skinny_table SKINNY_BUTTONS[] = {
{"SpeedDial", SKINNY_BUTTON_SPEED_DIAL}, {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
{"Line", SKINNY_BUTTON_LINE}, {"Line", SKINNY_BUTTON_LINE},
{"Voicemail", SKINNY_BUTTON_VOICEMAIL}, {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
{"Privacy", SKINNY_BUTTON_PRIVACY},
{"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
{"Undefined", SKINNY_BUTTON_UNDEFINED}, {"Undefined", SKINNY_BUTTON_UNDEFINED},
{NULL, 0} {NULL, 0}
}; };
@ -723,6 +727,50 @@ void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed
*button = helper.button; *button = helper.button;
} }
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;
}
struct feature_get_helper { struct feature_get_helper {
uint32_t pos; uint32_t pos;
struct feature_stat_res_message *button; struct feature_stat_res_message *button;
@ -756,11 +804,11 @@ void skinny_feature_get(listener_t *listener, uint32_t instance, struct feature_
if ((sql = switch_mprintf( if ((sql = switch_mprintf(
"SELECT '%d' AS wanted_position, position, label, value, settings " "SELECT '%d' AS wanted_position, position, label, value, settings "
"FROM skinny_buttons " "FROM skinny_buttons "
"WHERE device_name='%s' AND NOT (type=%d OR type=%d) " "WHERE device_name='%s' AND NOT (type=%d OR type=%d OR type=%d) "
"ORDER BY position", "ORDER BY position",
instance, instance,
listener->device_name, listener->device_name,
SKINNY_BUTTON_LINE, SKINNY_BUTTON_SPEED_DIAL SKINNY_BUTTON_LINE, SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL
))) { ))) {
skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper); skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper);
switch_safe_free(sql); switch_safe_free(sql);
@ -1558,6 +1606,26 @@ switch_status_t skinny_handle_speed_dial_stat_request(listener_t *listener, skin
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
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;
}
switch_status_t skinny_handle_feature_stat_request(listener_t *listener, skinny_message_t *request) switch_status_t skinny_handle_feature_stat_request(listener_t *listener, skinny_message_t *request)
{ {
skinny_message_t *message; skinny_message_t *message;
@ -2049,6 +2117,8 @@ switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *re
return skinny_handle_line_stat_request(listener, request); return skinny_handle_line_stat_request(listener, request);
case SPEED_DIAL_STAT_REQ_MESSAGE: case SPEED_DIAL_STAT_REQ_MESSAGE:
return skinny_handle_speed_dial_stat_request(listener, request); return skinny_handle_speed_dial_stat_request(listener, request);
case SERVICE_URL_STAT_REQ_MESSAGE:
return skinny_handle_service_url_stat_request(listener, request);
case FEATURE_STAT_REQ_MESSAGE: case FEATURE_STAT_REQ_MESSAGE:
return skinny_handle_feature_stat_request(listener, request); return skinny_handle_feature_stat_request(listener, request);
case REGISTER_AVAILABLE_LINES_MESSAGE: case REGISTER_AVAILABLE_LINES_MESSAGE:

21
src/mod/endpoints/mod_skinny/skinny_protocol.h
View File

@ -159,6 +159,12 @@ struct soft_key_event_message {
/* SoftKeyTemplateReqMessage */ /* SoftKeyTemplateReqMessage */
#define SOFT_KEY_TEMPLATE_REQ_MESSAGE 0x0028 #define SOFT_KEY_TEMPLATE_REQ_MESSAGE 0x0028
/* ServiceUrlStatReqMessage */
#define SERVICE_URL_STAT_REQ_MESSAGE 0x0033
struct service_url_stat_req_message {
uint32_t service_url_index;
};
/* FeatureStatReqMessage */ /* FeatureStatReqMessage */
#define FEATURE_STAT_REQ_MESSAGE 0x0034 #define FEATURE_STAT_REQ_MESSAGE 0x0034
struct feature_stat_req_message { struct feature_stat_req_message {
@ -464,6 +470,13 @@ struct feature_stat_res_message {
uint32_t status; uint32_t status;
}; };
/* ServiceUrlStatMessage */
#define SERVICE_URL_STAT_RES_MESSAGE 0x012F
struct service_url_stat_res_message {
uint32_t index;
char url[256];
char display_name[40];
};
/*****************************************************************************/ /*****************************************************************************/
/* SKINNY MESSAGE */ /* SKINNY MESSAGE */
@ -484,6 +497,7 @@ union skinny_data {
struct alarm_message alarm; struct alarm_message alarm;
struct open_receive_channel_ack_message open_receive_channel_ack; struct open_receive_channel_ack_message open_receive_channel_ack;
struct soft_key_event_message soft_key_event; struct soft_key_event_message soft_key_event;
struct service_url_stat_req_message service_url_req;
struct feature_stat_req_message feature_req; struct feature_stat_req_message feature_req;
struct headset_status_message headset_status; struct headset_status_message headset_status;
struct register_available_lines_message reg_lines; struct register_available_lines_message reg_lines;
@ -515,6 +529,7 @@ union skinny_data {
struct unregister_ack_message unregister_ack; struct unregister_ack_message unregister_ack;
struct dialed_number_message dialed_number; struct dialed_number_message dialed_number;
struct feature_stat_res_message feature_res; struct feature_stat_res_message feature_res;
struct service_url_stat_res_message service_url_res;
uint16_t as_uint16; uint16_t as_uint16;
char as_char; char as_char;
@ -626,7 +641,7 @@ uint32_t func(const char *str)\
status = SWITCH_STATUS_SUCCESS;\ status = SWITCH_STATUS_SUCCESS;\
} }
struct skinny_table SKINNY_MESSAGE_TYPES[53]; struct skinny_table SKINNY_MESSAGE_TYPES[55];
const char *skinny_message_type2str(uint32_t id); const char *skinny_message_type2str(uint32_t id);
uint32_t skinny_str2message_type(const char *str); uint32_t skinny_str2message_type(const char *str);
#define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES) #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
@ -694,9 +709,11 @@ enum skinny_button_definition {
SKINNY_BUTTON_SPEED_DIAL = 0x02, SKINNY_BUTTON_SPEED_DIAL = 0x02,
SKINNY_BUTTON_LINE = 0x09, SKINNY_BUTTON_LINE = 0x09,
SKINNY_BUTTON_VOICEMAIL = 0x0F, SKINNY_BUTTON_VOICEMAIL = 0x0F,
SKINNY_BUTTON_PRIVACY = 0x13,
SKINNY_BUTTON_SERVICE_URL = 0x14,
SKINNY_BUTTON_UNDEFINED = 0xFF, SKINNY_BUTTON_UNDEFINED = 0xFF,
}; };
struct skinny_table SKINNY_BUTTONS[6]; struct skinny_table SKINNY_BUTTONS[8];
const char *skinny_button2str(uint32_t id); const char *skinny_button2str(uint32_t id);
uint32_t skinny_str2button(const char *str); uint32_t skinny_str2button(const char *str);
#define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS) #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)