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

eliminate need for escaped , in [] 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8762 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-06-05 15:24:14 +00:00
parent c6e7543610
commit 6eebc86449
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/switch_ivr_originate.c
View File

@ -729,6 +729,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
for (r = 0; r < or_argc; r++) { for (r = 0; r < or_argc; r++) {
uint32_t hups; uint32_t hups;
char *p,*e = NULL;
reason = SWITCH_CAUSE_UNALLOCATED; reason = SWITCH_CAUSE_UNALLOCATED;
memset(peer_names, 0, sizeof(peer_names)); memset(peer_names, 0, sizeof(peer_names));
peer_session = NULL; peer_session = NULL;
@ -751,7 +753,24 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms);
switch_yield(sleep_ms * 1000); switch_yield(sleep_ms * 1000);
} }
p = pipe_names[r];
while(p && *p) {
if (*p == '[') {
e = switch_find_end_paren(p, '[', ']');
}
if (e && p && *p == ',') {
*p = '|';
}
if (p == e) {
e = NULL;
}
p++;
}
and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0]))); and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0])));
if ((flags & SOF_NOBLOCK) && and_argc > 1) { if ((flags & SOF_NOBLOCK) && and_argc > 1) {
@ -761,7 +780,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
for (i = 0; i < and_argc; i++) { for (i = 0; i < and_argc; i++) {
char *vdata; char *vdata;
char *e = NULL; e = NULL;
chan_type = peer_names[i]; chan_type = peer_names[i];
while (chan_type && *chan_type && *chan_type == ' ') { while (chan_type && *chan_type && *chan_type == ' ') {
@ -862,7 +881,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (vdata) { if (vdata) {
char *var_array[1024] = { 0 }; char *var_array[1024] = { 0 };
int var_count = 0; int var_count = 0;
if ((var_count = switch_separate_string(vdata, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { if ((var_count = switch_separate_string(vdata, '|', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) {
int x = 0; int x = 0;
for (x = 0; x < var_count; x++) { for (x = 0; x < var_count; x++) {
char *inner_var_array[2] = { 0 }; char *inner_var_array[2] = { 0 };