add CF_DIALPLAN

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index d020775d4871d1448a2fc3b93e8710534db6af38..e04f437eb30bf52181ca222594b5f658297926d5 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1095,6 +1095,7 @@ typedef enum {
        CF_BRIDGE_NOWRITE,
        CF_RECOVERED,
        CF_JITTERBUFFER,
+       CF_DIALPLAN,
        /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
        CF_FLAG_MAX
 } switch_channel_flag_t;

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index ccd6dacc9ccd9823af8385aaa552ec4f9e2bbc0b..59cc17d33ad24e0022ca484ec73aa4342a4de153 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -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_test_flag(session->channel, CF_ANSWERED)) {
                                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index ceab8b1b963625172e689061bd012188c78ca65d..aa5ddb9232ae824147c59c4544648e7c8295f74b 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -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_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;
                number = caller_profile->callee_id_number;