From da5a2f406987459af3c3f9e0a3e81aeda6051646 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 30 Dec 2016 17:36:52 -0600 Subject: [PATCH] FS-9206 backport --- src/mod/endpoints/mod_sofia/mod_sofia.c | 41 ++++++++++---- src/mod/endpoints/mod_sofia/sofia.c | 72 ++++++++++++++++++------- src/switch_core_media.c | 2 +- 3 files changed, 83 insertions(+), 32 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 3d6757816a..2de18e4b6f 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -664,17 +664,36 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session) b_sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE); switch_core_media_set_local_sdp(session, b_sdp, SWITCH_TRUE); - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY nomedia - sending ack, SDP:\n%s\n", tech_pvt->mparams.local_sdp_str); + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, + "3PCC-PROXY nomedia - sending ack, SDP:\n%s\n", tech_pvt->mparams.local_sdp_str); + + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { + switch_core_media_patch_sdp(tech_pvt->session); + switch_core_media_proxy_remote_addr(tech_pvt->session, NULL); + } + + if (sofia_use_soa(tech_pvt)) { + nua_ack(tech_pvt->nh, + TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->mparams.local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_RTP_SELECT(1), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), + TAG_END()); + } else { + nua_ack(tech_pvt->nh, + NUTAG_MEDIA_ENABLE(0), + TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_CONTENT_TYPE_STR("application/sdp")), + TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_PAYLOAD_STR(tech_pvt->mparams.local_sdp_str)), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_END()); + } + - nua_ack(tech_pvt->nh, - TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), - SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SOATAG_USER_SDP_STR(tech_pvt->mparams.local_sdp_str), - SOATAG_REUSE_REJECTED(1), - SOATAG_RTP_SELECT(1), - SOATAG_AUDIO_AUX("cn telephone-event"), - TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), - TAG_END()); sofia_clear_flag(tech_pvt, TFLAG_3PCC_INVITE); // all done sofia_set_flag_locked(tech_pvt, TFLAG_ANS); sofia_set_flag_locked(tech_pvt, TFLAG_SDP); @@ -2134,7 +2153,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi while (switch_channel_ready(channel) && !sofia_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { switch_ivr_parse_all_events(session); - switch_cond_next(); + switch_yield(10000); } /* Regain lock on sofia */ diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index f2eb3becd8..00ff939d5c 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -1634,6 +1634,16 @@ static void our_sofia_event_callback(nua_event_t event, switch_core_recovery_track(session); sofia_set_flag(tech_pvt, TFLAG_GOT_ACK); + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) && r_sdp) { + if (sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY)) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Got my ACK\n"); + sofia_set_flag(tech_pvt, TFLAG_3PCC_HAS_ACK); + sofia_clear_flag(tech_pvt, TFLAG_PASS_ACK); + } + + } + + if (sofia_test_flag(tech_pvt, TFLAG_PASS_ACK)) { switch_core_session_t *other_session; @@ -7254,15 +7264,27 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, private_object_t *other_tech_pvt = switch_core_session_get_private(other_session); sofia_glue_clear_soa(other_session, SWITCH_TRUE); - - nua_ack(other_tech_pvt->nh, - NUTAG_MEDIA_ENABLE(0), - TAG_IF(!zstr(other_tech_pvt->user_via), SIPTAG_VIA_STR(other_tech_pvt->user_via)), - SIPTAG_CONTACT_STR(other_tech_pvt->reply_contact), - SIPTAG_CONTENT_TYPE_STR("application/sdp"), - SIPTAG_PAYLOAD_STR(r_sdp), - TAG_END()); - + + if (sofia_use_soa(other_tech_pvt)) { + nua_ack(other_tech_pvt->nh, + TAG_IF(!zstr(other_tech_pvt->user_via), SIPTAG_VIA_STR(other_tech_pvt->user_via)), + SIPTAG_CONTACT_STR(other_tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(r_sdp), + SOATAG_REUSE_REJECTED(1), + SOATAG_RTP_SELECT(1), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF(sofia_test_pflag(other_tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), + TAG_END()); + } else { + nua_ack(other_tech_pvt->nh, + NUTAG_MEDIA_ENABLE(0), + TAG_IF(!zstr(other_tech_pvt->user_via), SIPTAG_VIA_STR(other_tech_pvt->user_via)), + SIPTAG_CONTACT_STR(other_tech_pvt->reply_contact), + TAG_IF(r_sdp, SIPTAG_CONTENT_TYPE_STR("application/sdp")), + TAG_IF(r_sdp, SIPTAG_PAYLOAD_STR(r_sdp)), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_END()); + } nua_ack(tech_pvt->nh, TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), @@ -7309,17 +7331,27 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, switch_core_media_activate_rtp(session); - nua_ack(tech_pvt->nh, - TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), - SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - //SOATAG_USER_SDP_STR(tech_pvt->mparams.local_sdp_str), - TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_CONTENT_TYPE_STR("application/sdp")), - TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_PAYLOAD_STR(tech_pvt->mparams.local_sdp_str)), - //SOATAG_REUSE_REJECTED(1), - //SOATAG_RTP_SELECT(1), - SOATAG_AUDIO_AUX("cn telephone-event"), - //TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), - TAG_END()); + + if (sofia_use_soa(tech_pvt)) { + nua_ack(tech_pvt->nh, + TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->mparams.local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_RTP_SELECT(1), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), + TAG_END()); + } else { + nua_ack(tech_pvt->nh, + NUTAG_MEDIA_ENABLE(0), + TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_CONTENT_TYPE_STR("application/sdp")), + TAG_IF(tech_pvt->mparams.local_sdp_str, SIPTAG_PAYLOAD_STR(tech_pvt->mparams.local_sdp_str)), + SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_END()); + } switch_channel_clear_flag(channel, CF_3P_MEDIA_REQUESTED); goto done; diff --git a/src/switch_core_media.c b/src/switch_core_media.c index bb11cf0959..635a00f5b7 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -5991,7 +5991,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_proxy_remote_addr(switch_core_ switch_channel_set_flag(session->channel, CF_VIDEO); } - if (v_engine->cur_payload_map->remote_sdp_ip && v_engine->cur_payload_map->remote_sdp_port) { + if (v_engine->cur_payload_map && v_engine->cur_payload_map->remote_sdp_ip && v_engine->cur_payload_map->remote_sdp_port) { if (!strcmp(v_engine->cur_payload_map->remote_sdp_ip, rip) && atoi(rvp) == v_engine->cur_payload_map->remote_sdp_port) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", v_engine->cur_payload_map->remote_sdp_ip, v_engine->cur_payload_map->remote_sdp_port);