From 0e3b4cada39ba7b54896b1ca09ba370c5cedefc2 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 5 Jun 2007 16:50:51 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5267 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_utils.h | 4 +++- src/switch_caller.c | 22 +++++++++++----------- src/switch_channel.c | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index cef526e008..2e1564eaba 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -177,11 +177,13 @@ switch_mutex_unlock(obj->flag_mutex); #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; for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; if (x < 32 || x > 127) { *p = ' '; } } + + return s; } diff --git a/src/switch_caller.c b/src/switch_caller.c index e1a0a6f1c9..318052cbae 100644 --- a/src/switch_caller.c +++ b/src/switch_caller.c @@ -51,17 +51,17 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memor if (!context) { context = "default"; } - profile->username = switch_core_strdup(pool, switch_str_nil(username)); - profile->dialplan = 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_number = switch_core_strdup(pool, switch_str_nil(caller_id_number)); - profile->network_addr = switch_core_strdup(pool, switch_str_nil(network_addr)); - profile->ani = switch_core_strdup(pool, switch_str_nil(ani)); - profile->aniii = switch_core_strdup(pool, switch_str_nil(aniii)); - profile->rdnis = switch_core_strdup(pool, switch_str_nil(rdnis)); - profile->source = switch_core_strdup(pool, switch_str_nil(source)); - profile->context = switch_core_strdup(pool, switch_str_nil(context)); - profile->destination_number = switch_core_strdup(pool, switch_str_nil(destination_number)); + profile->username = switch_clean_string(switch_core_strdup(pool, switch_str_nil(username))); + profile->dialplan = switch_clean_string(switch_core_strdup(pool, switch_str_nil(dialplan))); + profile->caller_id_name = switch_clean_string(switch_core_strdup(pool, switch_str_nil(caller_id_name))); + profile->caller_id_number = switch_clean_string(switch_core_strdup(pool, switch_str_nil(caller_id_number))); + profile->network_addr = switch_clean_string(switch_core_strdup(pool, switch_str_nil(network_addr))); + profile->ani = switch_clean_string(switch_core_strdup(pool, switch_str_nil(ani))); + profile->aniii = switch_clean_string(switch_core_strdup(pool, switch_str_nil(aniii))); + profile->rdnis = switch_clean_string(switch_core_strdup(pool, switch_str_nil(rdnis))); + profile->source = switch_clean_string(switch_core_strdup(pool, switch_str_nil(source))); + profile->context = switch_clean_string(switch_core_strdup(pool, switch_str_nil(context))); + profile->destination_number = switch_clean_string(switch_core_strdup(pool, switch_str_nil(destination_number))); switch_set_flag(profile, SWITCH_CPF_SCREEN); } diff --git a/src/switch_channel.c b/src/switch_channel.c index 9948a73521..68a1a1b646 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -389,7 +389,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *ch switch_mutex_lock(channel->profile_mutex); switch_core_hash_delete(channel->variables, varname); 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 { switch_core_hash_delete(channel->variables, varname); }