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

FSCORE-357 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13285 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-05-12 14:54:34 +00:00
parent 345f531abb
commit 8286dedd5d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch_channel.c
View File

@ -796,7 +796,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *c
uint32_t to,
switch_channel_t *super_channel)
{
if (to) {
to++;
}
@ -2314,6 +2314,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
char dtstr[SWITCH_DTMF_LOG_LEN+1] = "";
int x = 0;
if (switch_channel_test_flag(channel, CF_TIMESTAMP_SET)) {
return SWITCH_STATUS_FALSE;
}
switch_channel_set_flag(channel, CF_TIMESTAMP_SET);
if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) {
return SWITCH_STATUS_FALSE;
}
@ -2506,8 +2512,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec);
switch_channel_set_variable(channel, "flow_billusec", tmp);
switch_channel_set_flag(channel, CF_TIMESTAMP_SET);
return status;
}

14
src/switch_ivr_originate.c
View File

@ -2056,16 +2056,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
channel = switch_core_session_get_channel(originate_status[i].peer_session);
switch_channel_wait_for_flag(channel,
CF_TIMESTAMP_SET,
SWITCH_TRUE,
5000,
NULL);
if (!switch_channel_test_flag(channel, CF_TIMESTAMP_SET) || !switch_core_session_running(originate_status[i].peer_session)) {
switch_core_session_reporting_state(originate_status[i].peer_session);
switch_channel_wait_for_state_timeout(channel, CS_REPORTING, 5000);
if (!switch_channel_test_flag(channel, CF_TIMESTAMP_SET)) {
switch_channel_set_timestamps(channel);
}
if (switch_ivr_generate_xml_cdr(originate_status[i].peer_session, &cdr) == SWITCH_STATUS_SUCCESS) {
if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) {
switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total);