FS-4331 please test and post a new log if necessary

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index a9f17cb33987f4e90e782fc5ea58aefe7647a358..c5e1fab7b4399c26b20dbffec71ab97fa2388655 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1224,6 +1224,7 @@ typedef enum {
        CF_CHANNEL_SWAP,
        CF_PICKUP,
        CF_CONFIRM_BLIND_TRANSFER,
+       CF_NO_PRESENCE,
        /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
        /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
        CF_FLAG_MAX

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 570d4ce286b8522419f49ebc7fe6a82889222cdc..0937b37c3c91121b6d2daf99ddb901ebdbd88be5 100755 (executable)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -3521,6 +3521,7 @@ static switch_call_cause_t pickup_outgoing_channel(switch_core_session_t *sessio
 
        pickup_add_session(nsession, pickup);
        switch_channel_set_flag(nchannel, CF_PICKUP);
+       switch_channel_set_flag(nchannel, CF_NO_PRESENCE);
        
        goto done;
 

diff --git a/src/switch_channel.c b/src/switch_channel.c
index c214cfd8810f0191c1353d44ebfaa49cd53b9637..8c36f64fe7e1db871d4f3b3c52964040e9690495 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -606,6 +606,10 @@ SWITCH_DECLARE(void) switch_channel_perform_presence(switch_channel_t *channel,
        const char *call_info = NULL;
        char *call_info_state = "active";
 
+       if (switch_channel_test_flag(channel, CF_NO_PRESENCE)) {
+               return;
+       }
+
        if (!status) {
                type = SWITCH_EVENT_PRESENCE_OUT;
        }