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

Skinny: Rename skinny-default-soft-key-set-set to skinny-soft-key-set-set

This commit is contained in:
Mathieu Parent 2010-09-04 10:14:22 +02:00
parent 07c3c94d7a
commit ba3a6ad6c8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/directory/default/skinny-example.xml
View File

@ -3,7 +3,7 @@
<params>
<!-- for devices requesting firmware via SCCP, like ATA186
<param name="skinny-firmware-version" value="ATA030101SCCP04"
<param name="skinny-default-soft-key-set-set" value="default"
<param name="skinny-soft-key-set-set" value="default"
-->
<param name="foo" value="bar"/>
</params>

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

@ -135,7 +135,7 @@ struct listener {
uint32_t device_type;
char firmware_version[16];
char *default_soft_key_set_set;
char *soft_key_set_set;
switch_socket_t *sock;
switch_memory_pool_t *pool;

8
src/mod/endpoints/mod_skinny/skinny_server.c
View File

@ -999,8 +999,8 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
const char *value = switch_xml_attr_soft(xparam, "value");
if (!strcasecmp(name, "skinny-firmware-version")) {
strncpy(listener->firmware_version, value, 16);
} else if (!strcasecmp(name, "skinny-default-soft-key-set-set")) {
listener->default_soft_key_set_set = switch_core_strdup(profile->pool, value);
} else if (!strcasecmp(name, "skinny-soft-key-set-set")) {
listener->soft_key_set_set = switch_core_strdup(profile->pool, value);
}
}
}
@ -1697,8 +1697,8 @@ switch_status_t skinny_handle_soft_key_set_request(listener_t *listener, skinny_
{
skinny_message_t *message = NULL;
if (listener->default_soft_key_set_set) {
message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->default_soft_key_set_set);
if (listener->soft_key_set_set) {
message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->soft_key_set_set);
}
if (!message) {
message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, "default");