kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

build tweaks

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10121 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-10-23 01:39:04 +00:00
parent 69bd6a54d0
commit 2d764cc0b0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_channel.c
View File

@ -1534,14 +1534,14 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
channel->caller_profile->times->progress_media = switch_timestamp_now(); channel->caller_profile->times->progress_media = switch_timestamp_now();
if (channel->caller_profile->originator_caller_profile) { if (channel->caller_profile->originator_caller_profile) {
switch_core_session_t *other_session; switch_core_session_t *osession;
if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { if ((osession = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) {
switch_channel_t *other_channel; switch_channel_t *other_channel;
other_channel = switch_core_session_get_channel(other_session); other_channel = switch_core_session_get_channel(osession);
if (other_channel->caller_profile) { if (other_channel->caller_profile) {
other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media; other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media;
} }
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(osession);
} }
channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media; channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media;
} }

18
src/switch_ivr_originate.c
View File

@ -878,7 +878,7 @@ 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; char *p, *end = NULL;
const char *var_begin, *var_end; const char *var_begin, *var_end;
reason = SWITCH_CAUSE_NONE; reason = SWITCH_CAUSE_NONE;
@ -914,14 +914,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
p = pipe_names[r]; p = pipe_names[r];
while(p && *p) { while(p && *p) {
if (*p == '[') { if (*p == '[') {
e = switch_find_end_paren(p, '[', ']'); end = switch_find_end_paren(p, '[', ']');
} }
if (e && p && *p == ',') { if (end && p && *p == ',') {
*p = '|'; *p = '|';
} }
if (p == e) { if (p == end) {
e = NULL; e = NULL;
} }
@ -937,7 +937,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;
e = NULL; end = 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 == ' ') {
@ -945,12 +945,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
vdata = chan_type; vdata = chan_type;
e = switch_find_end_paren(vdata, '[', ']'); end = switch_find_end_paren(vdata, '[', ']');
if (e) { if (end) {
vdata++; vdata++;
*e++ = '\0'; *end++ = '\0';
chan_type = e; chan_type = end;
} else { } else {
vdata = NULL; vdata = NULL;
} }