]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-3814 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 17 Jan 2012 14:55:48 +0000 (08:55 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 17 Jan 2012 14:55:48 +0000 (08:55 -0600)
src/mod/endpoints/mod_sofia/mod_sofia.c

index 7ae2ec72943e725d23fca07d36f0aeb95f918bc8..710d134b89e7a672996257d6e29f277c73b4e2f5 100644 (file)
@@ -2461,14 +2461,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                {
                        switch_ring_ready_t ring_ready_val = msg->numeric_arg;
 
-                       if (sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY) && sofia_test_flag(tech_pvt, TFLAG_3PCC)) {
-                               switch_channel_mark_ring_ready(channel);
-                               status = SWITCH_STATUS_SUCCESS;
-                               switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->_file, msg->_func, msg->_line, NULL, SWITCH_LOG_INFO,
-                                                                 "Pretending to send ringing.  Not available for 3pcc calls\n");
-                               goto end_lock;
-                       }
-
                        if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) &&
                                !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
                                char *extra_header = sofia_glue_get_extra_headers(channel, SOFIA_SIP_PROGRESS_HEADER_PREFIX);
@@ -2517,14 +2509,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                        const char *val = NULL;
                        const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
 
-                       if (sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY) && sofia_test_flag(tech_pvt, TFLAG_3PCC)) {
-                               sofia_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
-                               switch_channel_mark_pre_answered(channel);
-                               status = SWITCH_STATUS_SUCCESS;
-                               switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->_file, msg->_func, msg->_line, NULL, SWITCH_LOG_INFO,
-                                                                 "Pretending to send early media.  Not available for 3pcc calls\n");
-                               goto end_lock;
-                       }
 
                        if (!sofia_test_flag(tech_pvt, TFLAG_ANS) && !sofia_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) {