FS-4542 --resolve ok if this causes any problems it should lead us back to this commit

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 59a2fae532e72c17f1dcba346dc33e2798d32f6a..a173544031966e47d232fc89853b294d008fb5cb 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -6030,8 +6030,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
        }
 
        if (session) {
-               if ((switch_channel_test_flag(channel, CF_EARLY_MEDIA) || switch_channel_test_flag(channel, CF_ANSWERED)) && (status == 180 || status == 183) && !r_sdp) {
-                       /* Must you send 180 after 183 w/sdp ? sheesh */
+               if (switch_channel_test_flag(channel, CF_ANSWERED) && (status == 180 || status == 183) && !r_sdp) {
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel %s skipping state [%s][%d]\n",
                                                          switch_channel_get_name(channel), nua_callstate_name(ss_state), status);
                        goto done;

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 2a3a7ad04fc9471e322bab39c2483a0c8f565ffa..38331f0be93d475bbba1bf6c0bffb9a47ac688bd 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2953,8 +2953,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi
 {
        switch_event_t *event;
 
-       if (!switch_channel_test_flag(channel, CF_RING_READY) && 
-               !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+       if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
                switch_channel_set_flag_value(channel, CF_RING_READY, rv);
                if (channel->caller_profile && channel->caller_profile->times) {