kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skinny: allow firmware version per device

This commit is contained in:
Mathieu Parent 2010-04-16 15:16:27 +02:00
parent 4263dda2de
commit deb2277936
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/endpoints/mod_skinny/mod_skinny.h
View File

@ -107,6 +107,8 @@ struct listener {
skinny_profile_t *profile; skinny_profile_t *profile;
char device_name[16]; char device_name[16];
uint32_t device_instance; uint32_t device_instance;
char firmware_version[16];
switch_socket_t *sock; switch_socket_t *sock;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;

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

@ -1609,7 +1609,7 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
skinny_profile_t *profile; skinny_profile_t *profile;
switch_event_t *event = NULL; switch_event_t *event = NULL;
switch_event_t *params = NULL; switch_event_t *params = NULL;
switch_xml_t xroot, xdomain, xgroup, xuser, xskinny, xbuttons, xbutton; switch_xml_t xroot, xdomain, xgroup, xuser, xskinny, xparams, xparam, xbuttons, xbutton;
char *sql; char *sql;
assert(listener->profile); assert(listener->profile);
profile = listener->profile; profile = listener->profile;
@ -1658,8 +1658,16 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
xskinny = switch_xml_child(xuser, "skinny"); xskinny = switch_xml_child(xuser, "skinny");
if (xskinny) { if (xskinny) {
xbuttons = switch_xml_child(xskinny, "buttons"); if ((xparams = switch_xml_child(xskinny, "params"))) {
if (xbuttons) { for (xparam = switch_xml_child(xparams, "param"); xparam; xparam = xparam->next) {
const char *name = switch_xml_attr_soft(xparam, "name");
const char *value = switch_xml_attr_soft(xparam, "value");
if (!strcasecmp(name, "skinny-firmware-version")) {
strncpy(listener->firmware_version, value, 16);
}
}
}
if ((xbuttons = switch_xml_child(xskinny, "buttons"))) {
uint32_t line_instance = 1; uint32_t line_instance = 1;
for (xbutton = switch_xml_child(xbuttons, "button"); xbutton; xbutton = xbutton->next) { for (xbutton = switch_xml_child(xbuttons, "button"); xbutton; xbutton = xbutton->next) {
uint32_t position = atoi(switch_xml_attr_soft(xbutton, "position")); uint32_t position = atoi(switch_xml_attr_soft(xbutton, "position"));
@ -2118,11 +2126,14 @@ switch_status_t skinny_handle_button_template_request(listener_t *listener, skin
switch_status_t skinny_handle_version_request(listener_t *listener, skinny_message_t *request) switch_status_t skinny_handle_version_request(listener_t *listener, skinny_message_t *request)
{ {
/* TODO */ if (!zstr(listener->firmware_version)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, return send_version(listener, listener->firmware_version);
"VersionReqMessage not implemented yet.\n"); } else {
return SWITCH_STATUS_SUCCESS; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
/* return send_version(listener, ""); */ "Device %s:%d is requesting for firmware version, but none is set.\n",
listener->device_name, listener->device_instance);
return SWITCH_STATUS_SUCCESS;
}
} }
switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny_message_t *request) switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny_message_t *request)