retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5267 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-06-05 16:50:51 +00:00
parent b7c178f2d5
commit 0e3b4cada3
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/switch_utils.h
View File

@ -177,11 +177,13 @@ switch_mutex_unlock(obj->flag_mutex);
#define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) #define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst))
static __inline__ void switch_clean_string(char *s) static __inline__ char *switch_clean_string(char *s)
{ char *p; { char *p;
for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; if (x < 32 || x > 127) { *p = ' '; } for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; if (x < 32 || x > 127) { *p = ' '; }
} }
return s;
} }

22
src/switch_caller.c
View File

@ -51,17 +51,17 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor
if (!context) { if (!context) {
context = "default"; context = "default";
} }
profile->username = switch_core_strdup(pool, switch_str_nil(username)); profile->username = switch_clean_string(switch_core_strdup(pool, switch_str_nil(username)));
profile->dialplan = switch_core_strdup(pool, switch_str_nil(dialplan)); profile->dialplan = switch_clean_string(switch_core_strdup(pool, switch_str_nil(dialplan)));
profile->caller_id_name = switch_core_strdup(pool, switch_str_nil(caller_id_name)); profile->caller_id_name = switch_clean_string(switch_core_strdup(pool, switch_str_nil(caller_id_name)));
profile->caller_id_number = switch_core_strdup(pool, switch_str_nil(caller_id_number)); profile->caller_id_number = switch_clean_string(switch_core_strdup(pool, switch_str_nil(caller_id_number)));
profile->network_addr = switch_core_strdup(pool, switch_str_nil(network_addr)); profile->network_addr = switch_clean_string(switch_core_strdup(pool, switch_str_nil(network_addr)));
profile->ani = switch_core_strdup(pool, switch_str_nil(ani)); profile->ani = switch_clean_string(switch_core_strdup(pool, switch_str_nil(ani)));
profile->aniii = switch_core_strdup(pool, switch_str_nil(aniii)); profile->aniii = switch_clean_string(switch_core_strdup(pool, switch_str_nil(aniii)));
profile->rdnis = switch_core_strdup(pool, switch_str_nil(rdnis)); profile->rdnis = switch_clean_string(switch_core_strdup(pool, switch_str_nil(rdnis)));
profile->source = switch_core_strdup(pool, switch_str_nil(source)); profile->source = switch_clean_string(switch_core_strdup(pool, switch_str_nil(source)));
profile->context = switch_core_strdup(pool, switch_str_nil(context)); profile->context = switch_clean_string(switch_core_strdup(pool, switch_str_nil(context)));
profile->destination_number = switch_core_strdup(pool, switch_str_nil(destination_number)); profile->destination_number = switch_clean_string(switch_core_strdup(pool, switch_str_nil(destination_number)));
switch_set_flag(profile, SWITCH_CPF_SCREEN); switch_set_flag(profile, SWITCH_CPF_SCREEN);
} }

2
src/switch_channel.c
View File

@ -389,7 +389,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *ch
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete(channel->variables, varname);
if (!switch_strlen_zero(value)) { if (!switch_strlen_zero(value)) {
switch_core_hash_insert_dup(channel->variables, varname, switch_core_session_strdup(channel->session, value)); switch_core_hash_insert_dup(channel->variables, varname, switch_clean_string(switch_core_session_strdup(channel->session, value)));
} else { } else {
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete(channel->variables, varname);
} }