FS-9422 #resolve [Freeswitch Exit/Crash on SDP Negotiation] #comment renegotiate...

diff --git a/src/include/switch_core_media.h b/src/include/switch_core_media.h
index 988ebbea423cd55c981cd6764a01bb359cfed10b..096bc815fc7de1952cf800da4494e5ada5101129 100644 (file)
--- a/src/include/switch_core_media.h
+++ b/src/include/switch_core_media.h
@@ -64,8 +64,6 @@ typedef enum {
        SCMF_CODEC_GREEDY,
        SCMF_CODEC_SCROOGE,
        SCMF_DISABLE_HOLD,
-       SCMF_RENEG_ON_HOLD,
-       SCMF_RENEG_ON_REINVITE,
        SCMF_LIBERAL_DTMF,
        SCMF_SUPPRESS_CNG,
        SCMF_DISABLE_RTP_AUTOADJ,

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index b43be77da434ffefe76937ce5042ab01311caf9a..36ef8b06b9803aa29df14bffaabd46c889ab1ee5 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1213,7 +1213,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
        case SWITCH_MESSAGE_INDICATE_MEDIA_RENEG:
                {
                        if (msg->string_arg) {
-                               sofia_set_media_flag(tech_pvt->profile, SCMF_RENEG_ON_REINVITE);
                                sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA);
                        }
 

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index dad12ed7b4da990a83fb1196c8130b08ce409a42..8d561c3f80a351346050c4f739997ff471bd967b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4330,7 +4330,6 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
                                        sofia_set_pflag(profile, PFLAG_ENABLE_CHAT);
                                        profile->auto_restart = 1;
                                        sofia_set_media_flag(profile, SCMF_AUTOFIX_TIMING);
-                                       sofia_set_media_flag(profile, SCMF_RENEG_ON_REINVITE);
                                        sofia_set_media_flag(profile, SCMF_RTP_AUTOFLUSH_DURING_BRIDGE);
                                        profile->contact_user = SOFIA_DEFAULT_CONTACT_USER;
                                        sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
@@ -4609,18 +4608,6 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
                                                } else {
                                                        sofia_clear_pflag(profile, PFLAG_IGNORE_183NOSDP);
                                                }
-                                       } else if (!strcasecmp(var, "renegotiate-codec-on-hold")) {
-                                               if (switch_true(val)) {
-                                                       sofia_set_media_flag(profile, SCMF_RENEG_ON_HOLD);
-                                               } else {
-                                                       sofia_clear_media_flag(profile, SCMF_RENEG_ON_HOLD);
-                                               }
-                                       } else if (!strcasecmp(var, "renegotiate-codec-on-reinvite")) {
-                                               if (switch_true(val)) {
-                                                       sofia_set_media_flag(profile, SCMF_RENEG_ON_REINVITE);
-                                               } else {
-                                                       sofia_clear_media_flag(profile, SCMF_RENEG_ON_REINVITE);
-                                               }
                                        } else if (!strcasecmp(var, "presence-probe-on-register")) {
                                                if (switch_true(val)) {
                                                        sofia_set_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER);

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 8ce002047552b3bd1b9ba6c9eb4a9c91bb17c6ae..817b0e837e0e3300428d1008dd94b6d24c7210ca 100644 (file)
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -2389,8 +2389,6 @@ static void verto_set_media_options(verto_pvt_t *tech_pvt, verto_profile_t *prof
        tech_pvt->mparams->jb_msec = "-1";
        switch_media_handle_set_media_flag(tech_pvt->smh, SCMF_SUPPRESS_CNG);
 
-       switch_media_handle_set_media_flag(tech_pvt->smh, SCMF_RENEG_ON_REINVITE);
-
        //tech_pvt->mparams->auto_rtp_bugs = profile->auto_rtp_bugs;
        tech_pvt->mparams->timer_name =  profile->timer_name;
        //tech_pvt->mparams->vflags = profile->vflags;

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 84ce2322a3a5837481610ffbffdfacbcc3263c67..03678e6e3382c841bbe8d1cda113affa81fc22a0 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -1868,7 +1868,6 @@ SWITCH_DECLARE(void) switch_core_media_prepare_codecs(switch_core_session_t *ses
        switch_channel_set_variable(session->channel, "rtp_use_codec_string", codec_string);
        smh->codec_order_last = switch_separate_string(tmp_codec_string, ',', smh->codec_order, SWITCH_MAX_CODECS);
        smh->mparams->num_codecs = switch_loadable_module_get_codecs_sorted(smh->codecs, smh->fmtp, SWITCH_MAX_CODECS, smh->codec_order, smh->codec_order_last);
-
 }
 
 static void check_jb(switch_core_session_t *session, const char *input, int32_t jb_msec, int32_t maxlen, switch_bool_t silent)
@@ -3716,7 +3715,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
        int scrooge = 0;
        sdp_parser_t *parser = NULL;
        sdp_session_t *sdp;
-       int reneg = 1;
        const switch_codec_implementation_t **codec_array;
        int total_codecs;
        switch_rtp_engine_t *a_engine, *v_engine;
@@ -4104,48 +4102,15 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                                          && switch_true(val)))
                                && !smh->mparams->hold_laps) {
                                smh->mparams->hold_laps++;
-                               if (switch_core_media_toggle_hold(session, sendonly)) {
-                                       reneg = switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_HOLD);
-                                       if ((val = switch_channel_get_variable(session->channel, "rtp_renegotiate_codec_on_hold"))) {
-                                               reneg = switch_true(val);
-                                       }
-                               }
-                       }
-
-                       if (reneg) {
-                               reneg = switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_REINVITE);
-                               
-                               if ((val = switch_channel_get_variable(session->channel, "rtp_renegotiate_codec_on_reinvite"))) {
-                                       reneg = switch_true(val);
-                               }
-                       }
-
-                       if (session->bugs) {
-                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, 
-                                                                 "Session is connected to a media bug. "
-                                                                 "Re-Negotiation implicitly disabled.\n");
-                               reneg = 0;
-                       }
-                       
-                       if (switch_channel_test_flag(session->channel, CF_RECOVERING)) {
-                               reneg = 0;
-                       }
-                       
-                       if (sdp_type == SDP_TYPE_RESPONSE && smh->num_negotiated_codecs) {
-                               /* response to re-invite or update, only negotiated codecs are valid */
-                               reneg = 0;
+                               switch_core_media_toggle_hold(session, sendonly);
                        }
 
 
-                       if (!reneg && smh->num_negotiated_codecs) {
-                               codec_array = smh->negotiated_codecs;
-                               total_codecs = smh->num_negotiated_codecs;
-                       } else if (reneg) {
-                               smh->mparams->num_codecs = 0;
-                               switch_core_media_prepare_codecs(session, SWITCH_FALSE);
-                               codec_array = smh->codecs;
-                               total_codecs = smh->mparams->num_codecs;
-                       }
+                       smh->mparams->num_codecs = 0;
+                       smh->num_negotiated_codecs = 0;
+                       switch_core_media_prepare_codecs(session, SWITCH_FALSE);
+                       codec_array = smh->codecs;
+                       total_codecs = smh->mparams->num_codecs;
                        
 
                        if (switch_rtp_has_dtls() && dtls_ok(session)) {
@@ -4207,7 +4172,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                        }
 
                        x = 0;
-
+                       
                        for (map = m->m_rtpmaps; map; map = map->rm_next) {
                                int32_t i;
                                const char *rm_encoding;
@@ -4439,7 +4404,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
                                match = 1;
                                a_engine->codec_negotiated = 1;
-                               smh->num_negotiated_codecs = 0;
 
                                for(j = 0; j < m_idx; j++) {
                                        payload_map_t *pmap = switch_core_media_add_payload_map(session, 
@@ -4498,6 +4462,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                                        pmap->rm_fmtp = switch_core_session_strdup(session, (char *) mmap->rm_fmtp);
                                                
                                        pmap->agreed_pt = (switch_payload_t) mmap->rm_pt;
+
                                        smh->negotiated_codecs[smh->num_negotiated_codecs++] = mimp;
                                        pmap->recv_pt = (switch_payload_t)mmap->rm_pt;
                                                
@@ -4531,14 +4496,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
 
 
-#if 0
-                               if (!switch_true(mirror) && 
-                                       switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND && 
-                                       (!switch_channel_test_flag(session->channel, CF_REINVITE) || switch_media_handle_test_media_flag(smh, SCMF_RENEG_ON_REINVITE))) {
-                                       switch_core_media_get_offered_pt(session, matches[0].imp, &a_engine->cur_payload_map->recv_pt);
-                               }
-#endif
-                               
                                switch_snprintf(tmp, sizeof(tmp), "%d", a_engine->cur_payload_map->recv_pt);
                                switch_channel_set_variable(session->channel, "rtp_audio_recv_pt", tmp);
 
@@ -4786,10 +4743,11 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                                if (!(rm_encoding = map->rm_encoding)) {
                                        rm_encoding = "";
                                }
+                               printf("WTF TOT %d\n", total_codecs);
 
                                for (i = 0; i < total_codecs; i++) {
                                        const switch_codec_implementation_t *imp = codec_array[i];
-
+                                       
                                        if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) {
                                                continue;
                                        }
@@ -4825,7 +4783,8 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
                                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Compare [%s:%d] +++ is saved as a match\n",
                                                                                  imp->iananame, map->rm_pt);
-                                               m_idx++;
+
+                                               m_idx++;                                                
                                        }
 
                                        vmatch = 0;
@@ -9852,8 +9811,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
                                switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
                        }
 
-                       switch_media_handle_set_media_flag(smh, SCMF_RENEG_ON_REINVITE);
-                       
                        if (msg->numeric_arg && switch_core_session_get_partner(session, &nsession) == SWITCH_STATUS_SUCCESS) {
                                msg->numeric_arg = 0;
                                switch_core_session_receive_message(nsession, msg);