FSCORE-603

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index e9a426e10d43150cac3fe18f658b303d3ef6322a..e512a71ad80eab583839742c7458da1b4a8a5c39 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1562,6 +1562,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                        if (send_invite) {
                                switch_channel_set_flag(channel, CF_REQ_MEDIA);
                                sofia_glue_do_invite(session);
+                       } else {
+                               status = SWITCH_STATUS_FALSE;
                        }
                }
                break;

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index a12bd0e9eeb1ef7d0b480691b3c6036d56df3ee7..b466ef0feb8692602a31639be8d2dce4bfb4b396 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1204,7 +1204,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 
                if (switch_channel_test_flag(channel, CF_PROXY_MODE)) {
                        status = SWITCH_STATUS_SUCCESS;
-                       switch_core_session_receive_message(session, &msg);
+                       if (switch_core_session_receive_message(session, &msg) != SWITCH_STATUS_SUCCESS) {
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't re-establsh media on %s\n", switch_channel_get_name(channel));
+                               return SWITCH_STATUS_GENERR;
+                       }
 
                        if ((flags & SMF_IMMEDIATE)) {
                                switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 250, NULL);

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 2f6621b9e69fffa53ee0c02839d1c1c1b3d95f4f..94b3187a8c38533942540ca6ffdee5396719de90 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1798,17 +1798,21 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                        }
                }
 
-               if (!zstr(bypass_media)) {
+               if (!zstr(bypass_media) && !switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) {
                        if (switch_true(bypass_media)) {
                                switch_channel_set_flag(caller_channel, CF_PROXY_MODE);
                        } else if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
+                               if (!switch_channel_test_flag(caller_channel, CF_ANSWERED) && switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
+                                       switch_channel_set_variable(caller_channel, SWITCH_B_SDP_VARIABLE, NULL);
+                                       switch_channel_answer(caller_channel);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, 
+                                                                         "Must answer channel %s due to SIP PARADOX\n", switch_channel_get_name(caller_channel));
+                               }
+                               switch_channel_set_variable(caller_channel, SWITCH_B_SDP_VARIABLE, NULL);
                                switch_ivr_media(switch_core_session_get_uuid(session), SMF_NONE);
                        }
                }
 
-               switch_channel_set_variable(caller_channel, SWITCH_B_SDP_VARIABLE, NULL);
-
-
                if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && switch_channel_media_ready(caller_channel)) {
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
                                                          "Channel is already up, delaying proxy mode 'till both legs are answered.\n");
@@ -1816,14 +1820,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                        switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL);
                        switch_channel_clear_flag(caller_channel, CF_PROXY_MODE);
                }
-
-
-               if (switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA) && switch_channel_media_ready(caller_channel)) {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel is already up, proxy media cannot be used anymore\n");
-                       switch_channel_set_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE, NULL);
-                       switch_channel_clear_flag(caller_channel, CF_PROXY_MEDIA);
-               }
-
        }
 
        if (timelimit_sec <= 0) {