tweak to MODENDP-126 commit

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9688 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index cc1d32db45532d7a9970fddc1531896396ddac9f..53382aa668bbb7540ca012a43cabece51b2e6bdc 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -395,7 +395,6 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
                return SWITCH_STATUS_SUCCESS;
        }
 
-       switch_set_flag_locked(tech_pvt, TFLAG_ANS);
 
        b_sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE);
        is_proxy = (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA));
@@ -474,6 +473,8 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
                                SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
                                SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END());
 
+       switch_set_flag_locked(tech_pvt, TFLAG_ANS);
+
        return SWITCH_STATUS_SUCCESS;
 }
 

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 34f2e44882a80b7965e176f901c5697018b9135f..5fbef5bc5cdd4a8e61b30172bcb8ec1daea3d39d 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2207,7 +2207,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
                                        if (m->m_proto != sdp_proto_srtp) {
                                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=crypto in RTP/AVP\n");
                                                match = 0;
-                                               break;
+                                               goto done;
                                        }
 
                                        crypto = attr->a_value;
@@ -2506,7 +2506,8 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
                        }
                }
        }
-
+       
+ done:
 
        switch_set_flag_locked(tech_pvt, TFLAG_SDP);