FS-11421: [core,mod_sofia] Fix rtp_pass_codecs_on_stream_change to process all sdp...

diff --git a/src/include/switch_core_media.h b/src/include/switch_core_media.h
index 60e9b0f3d25727e0390e73adbfc5da22635d9c38..ef9ddda9649add85e0f44e349e49ca71344cd0d4 100644 (file)
--- a/src/include/switch_core_media.h
+++ b/src/include/switch_core_media.h
@@ -270,6 +270,10 @@ SWITCH_DECLARE(switch_rtp_stats_t *) switch_core_media_get_stats(switch_core_ses
 
 
 SWITCH_DECLARE(void) switch_core_media_set_sdp_codec_string(switch_core_session_t *session, const char *r_sdp, switch_sdp_type_t sdp_type);
+SWITCH_DECLARE(void) switch_core_media_merge_sdp_codec_string(switch_core_session_t *session, const char *r_sdp,
+                                                                                                                         switch_sdp_type_t sdp_type, const char *codec_string);
+                                                                       
+
 SWITCH_DECLARE(void) switch_core_media_reset_autofix(switch_core_session_t *session, switch_media_type_t type);
 SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_t *session, switch_core_session_t *o_session);
 SWITCH_DECLARE(switch_status_t) switch_core_media_codec_chosen(switch_core_session_t *session, switch_media_type_t media);

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index b77207f1eac8f5937116275311f80594befa7248..60105de3c9dc83d3690b9204aac6cdfd1b6af580 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -587,6 +587,23 @@ SWITCH_STANDARD_APP(sched_heartbeat_function)
 
 }
 
+#define FILTER_CODECS_SYNTAX "<codec string>"
+SWITCH_STANDARD_APP(filter_codecs_function)
+{
+       const char *r_sdp;
+       switch_channel_t *channel = switch_core_session_get_channel(session);
+
+       
+       r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);
+       
+       if (data && r_sdp) {
+               switch_core_media_merge_sdp_codec_string(session, r_sdp, SDP_TYPE_REQUEST, data);
+               switch_channel_set_variable(channel, "filter_codec_string", data);
+       } else {
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Incomplete data\n");
+       }
+}
+
 
 #define HEARTBEAT_SYNTAX "[0|<seconds>]"
 SWITCH_STANDARD_APP(heartbeat_function)
@@ -6507,6 +6524,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load)
        SWITCH_ADD_APP(app_interface, "enable_heartbeat", "Enable Media Heartbeat", "Enable Media Heartbeat",
                                   heartbeat_function, HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA);
 
+       SWITCH_ADD_APP(app_interface, "filter_codecs", "Filter Codecs", "Filter Codecs", filter_codecs_function, FILTER_CODECS_SYNTAX, SAF_SUPPORT_NOMEDIA);
+
        SWITCH_ADD_APP(app_interface, "enable_keepalive", "Enable Keepalive", "Enable Keepalive",
                                   keepalive_function, KEEPALIVE_SYNTAX, SAF_SUPPORT_NOMEDIA);
 

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index e30d80879b12a04b903bbd4438ee2fc4360b1daa..a1aecbe0a3d3fef65135da7833d5fff30652004e 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -2172,7 +2172,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                break;
        case SWITCH_MESSAGE_INDICATE_RESPOND:
                {
-
+                       printf("WHAT THE FUCKING HELL? %d\n", switch_channel_test_flag(tech_pvt->channel, CF_AWAITING_STREAM_CHANGE));
                        if (switch_channel_test_flag(tech_pvt->channel, CF_AWAITING_STREAM_CHANGE)) {
                                switch_channel_clear_flag(tech_pvt->channel, CF_AWAITING_STREAM_CHANGE);
 

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 83c9fc5f6ca322af43039111a67fd1a0a4cdeb21..e27e9224af464c7f37cc08f306462ac469323e7a 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -4623,7 +4623,7 @@ static void media_flow_get_mode(switch_media_flow_t smode, const char **mode_str
        
 }
 
-static void check_stream_changes(switch_core_session_t *session, switch_sdp_type_t sdp_type)
+static void check_stream_changes(switch_core_session_t *session, const char *r_sdp, switch_sdp_type_t sdp_type)
 {
        switch_core_session_t *other_session = NULL;
        switch_core_session_message_t *msg;
@@ -4637,6 +4637,14 @@ static void check_stream_changes(switch_core_session_t *session, switch_sdp_type
                if (other_session) {
                        switch_channel_set_flag(other_session->channel, CF_PROCESSING_STREAM_CHANGE);
                        switch_channel_set_flag(session->channel, CF_AWAITING_STREAM_CHANGE);
+
+                       if (sdp_type == SDP_TYPE_REQUEST && r_sdp) {
+                               const char *filter_codec_string = switch_channel_get_variable(session->channel, "filter_codec_string");
+                               
+                               switch_core_media_merge_sdp_codec_string(session, r_sdp, sdp_type, filter_codec_string);
+                       }
+                       switch_core_session_check_outgoing_crypto(other_session);
+
                        msg = switch_core_session_alloc(other_session, sizeof(*msg));
                        msg->message_id = SWITCH_MESSAGE_INDICATE_MEDIA_RENEG;
                        msg->string_arg = switch_core_session_sprintf(other_session, "=%s", switch_channel_get_variable(session->channel, "ep_codec_string"));
@@ -4647,15 +4655,26 @@ static void check_stream_changes(switch_core_session_t *session, switch_sdp_type
 
        if (other_session) {
                if (sdp_type == SDP_TYPE_RESPONSE && switch_channel_test_flag(session->channel, CF_PROCESSING_STREAM_CHANGE)) {
+                       switch_channel_clear_flag(session->channel, CF_PROCESSING_STREAM_CHANGE);
+                       
                        if (switch_channel_test_flag(other_session->channel, CF_AWAITING_STREAM_CHANGE)) {
+                               uint8_t proceed = 1;
+                               const char *sdp_in, *other_ep;
+
+                               if ((other_ep = switch_channel_get_variable(session->channel, "ep_codec_string"))) {
+                                       switch_channel_set_variable(other_session->channel, "codec_string", other_ep);
+                               }
+
+                               sdp_in = switch_channel_get_variable(other_session->channel, SWITCH_R_SDP_VARIABLE);
+                               switch_core_media_negotiate_sdp(other_session, sdp_in, &proceed, SDP_TYPE_REQUEST);
+                               switch_core_media_activate_rtp(other_session);
                                msg = switch_core_session_alloc(other_session, sizeof(*msg));
                                msg->message_id = SWITCH_MESSAGE_INDICATE_RESPOND;
                                msg->from = __FILE__;
-                               
+
+                               switch_channel_set_flag(other_session->channel, CF_AWAITING_STREAM_CHANGE);
                                switch_core_session_queue_message(other_session, msg);
                        }
-                       
-                       switch_channel_clear_flag(session->channel, CF_PROCESSING_STREAM_CHANGE);
                }
 
                switch_core_session_rwunlock(other_session);
@@ -5972,6 +5991,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                        memset(near_matches, 0, sizeof(near_matches[0]) * MAX_MATCHES);
 
                        switch_channel_set_variable(session->channel, "video_possible", "true");
+                       switch_channel_set_flag(session->channel, CF_VIDEO_POSSIBLE);
                        switch_channel_set_flag(session->channel, CF_VIDEO_SDP_RECVD);
 
                        connection = sdp->sdp_connection;
@@ -6347,7 +6367,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
        smh->mparams->cng_pt = cng_pt;
        smh->mparams->cng_rate = cng_rate;
 
-       check_stream_changes(session, sdp_type);
+       check_stream_changes(session, r_sdp, sdp_type);
 
        return match || vmatch || tmatch || fmatch;
 }
@@ -11545,7 +11565,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 
        switch_core_media_set_local_sdp(session, buf, SWITCH_TRUE);
 
-       check_stream_changes(session, sdp_type);
+       check_stream_changes(session, NULL, sdp_type);
 
        switch_safe_free(buf);
 }
@@ -13064,6 +13084,15 @@ SWITCH_DECLARE(switch_jb_t *) switch_core_media_get_jb(switch_core_session_t *se
 //?
 SWITCH_DECLARE(void) switch_core_media_set_sdp_codec_string(switch_core_session_t *session, const char *r_sdp, switch_sdp_type_t sdp_type)
 {
+       switch_core_media_merge_sdp_codec_string(session, r_sdp, sdp_type, switch_core_media_get_codec_string(session));
+}
+
+SWITCH_DECLARE(void) switch_core_media_merge_sdp_codec_string(switch_core_session_t *session, const char *r_sdp,
+                                                                                                                         switch_sdp_type_t sdp_type, const char *codec_string)
+{
+
+       
+
        sdp_parser_t *parser;
        sdp_session_t *sdp;
        switch_media_handle_t *smh;
@@ -13078,10 +13107,15 @@ SWITCH_DECLARE(void) switch_core_media_set_sdp_codec_string(switch_core_session_
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Setting NULL SDP is invalid\n");
                return;
        }
+
+       if (zstr(codec_string)) {
+               codec_string = switch_core_media_get_codec_string(session);
+       }
+       
        if ((parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) {
 
                if ((sdp = sdp_session(parser))) {
-                       switch_core_media_set_r_sdp_codec_string(session, switch_core_media_get_codec_string(session), sdp, sdp_type);
+                       switch_core_media_set_r_sdp_codec_string(session, codec_string, sdp, sdp_type);
                }
 
                sdp_parser_free(parser);

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 30ca46cdb8bb5e4c797cd178f7bb08282a1aeeea..a448a5e67e086e4eb3b1feef65a9224e23043dc7 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -825,6 +825,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_process_indications(switch_core_sessi
                                switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
                        }
                        break;
+               case SWITCH_MESSAGE_INDICATE_RESPOND:
+                       switch_core_session_receive_message(session, message);
+                       status = SWITCH_STATUS_SUCCESS;
+                       break;
+
                default:
                status = SWITCH_STATUS_FALSE;
                        break;