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

add CF_DIALPLAN

This commit is contained in:
Anthony Minessale 2010-12-16 09:45:43 -06:00
parent 43393f26d1
commit 3ff07445d4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_types.h
View File

@ -1095,6 +1095,7 @@ typedef enum {
CF_BRIDGE_NOWRITE, CF_BRIDGE_NOWRITE,
CF_RECOVERED, CF_RECOVERED,
CF_JITTERBUFFER, CF_JITTERBUFFER,
CF_DIALPLAN,
/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
CF_FLAG_MAX CF_FLAG_MAX
} switch_channel_flag_t; } switch_channel_flag_t;

4
src/switch_core_state_machine.c
View File

@ -123,7 +123,9 @@ static void switch_core_standard_on_routing(switch_core_session_t *session)
} }
} }
if (!count) { if (count) {
switch_channel_set_flag(session->channel, CF_DIALPLAN);
} else {
if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
if (switch_channel_test_flag(session->channel, CF_ANSWERED)) { if (switch_channel_test_flag(session->channel, CF_ANSWERED)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,

2
src/switch_ivr_bridge.c
View File

@ -100,7 +100,7 @@ static void send_display(switch_core_session_t *session, switch_core_session_t *
caller_channel = switch_core_session_get_channel(session); caller_channel = switch_core_session_get_channel(session);
caller_profile = switch_channel_get_caller_profile(caller_channel); caller_profile = switch_channel_get_caller_profile(caller_channel);
if (switch_channel_direction(caller_channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { if (switch_channel_direction(caller_channel) == SWITCH_CALL_DIRECTION_OUTBOUND && !switch_channel_test_flag(caller_channel, CF_DIALPLAN)) {
name = caller_profile->callee_id_name; name = caller_profile->callee_id_name;
number = caller_profile->callee_id_number; number = caller_profile->callee_id_number;