mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-13 07:45:26 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5267 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
b7c178f2d5
commit
0e3b4cada3
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user