From 4a520d4a1e4436ff2f3001ea4b600d1fb69171cb Mon Sep 17 00:00:00 2001 From: Giovanni Maruzzelli Date: Wed, 3 Aug 2016 16:44:38 -0400 Subject: [PATCH 1/2] FS-9380: switch_core_media.c , fix_ext-rtip-ip_not_used_when_originating --- src/switch_core_media.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index cc4026fc11..8b2dab05de 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -6102,6 +6102,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_choose_port(switch_core_sessio use_ip = smh->mparams->rtpip; } + if (zstr(smh->mparams->remote_ip)) { /* no remote_ip, we're originating */ + if (!zstr(smh->mparams->extrtpip)) { /* and we've got an ext-rtp-ip, eg, from verto config */ + use_ip = smh->mparams->extrtpip; /* let's use it for composing local sdp to send to client */ + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, + "%s will use %s instead of %s in SDP, because we're originating and we have an ext-rtp-ip setting\n", + switch_channel_get_name(smh->session->channel), smh->mparams->extrtpip, smh->mparams->rtpip); + } + } engine->adv_sdp_port = sdp_port; engine->adv_sdp_ip = smh->mparams->adv_sdp_audio_ip = smh->mparams->extrtpip = switch_core_session_strdup(session, use_ip); From f5e8257da6ec247b913ee2439fe5de811236f5cb Mon Sep 17 00:00:00 2001 From: Giovanni Maruzzelli Date: Wed, 3 Aug 2016 16:55:34 -0400 Subject: [PATCH 2/2] FS-9380: switch_core_media.c , cleaned from logging --- src/switch_core_media.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 8b2dab05de..84ce2322a3 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -6105,9 +6105,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_choose_port(switch_core_sessio if (zstr(smh->mparams->remote_ip)) { /* no remote_ip, we're originating */ if (!zstr(smh->mparams->extrtpip)) { /* and we've got an ext-rtp-ip, eg, from verto config */ use_ip = smh->mparams->extrtpip; /* let's use it for composing local sdp to send to client */ + /* switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s will use %s instead of %s in SDP, because we're originating and we have an ext-rtp-ip setting\n", switch_channel_get_name(smh->session->channel), smh->mparams->extrtpip, smh->mparams->rtpip); + */ } } engine->adv_sdp_port = sdp_port;