kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #921 in FS/freeswitch from ~GMARUZZ/freeswitch:bugfix/FS-9380-fix_ext-rtip-ip_not_used_when_originating to master 

* commit 'f5e8257da6ec247b913ee2439fe5de811236f5cb':
  FS-9380: switch_core_media.c , cleaned from logging
  FS-9380: switch_core_media.c , fix_ext-rtip-ip_not_used_when_originating
This commit is contained in:
Anthony Minessale II 2016-08-03 15:33:24 -05:00
parent e2928b8a75 f5e8257da6
commit eebc2d9148
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch_core_media.c
View File

@ -6102,6 +6102,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_choose_port(switch_core_sessio
use_ip = smh->mparams->rtpip; 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_port = sdp_port;
engine->adv_sdp_ip = smh->mparams->adv_sdp_audio_ip = smh->mparams->extrtpip = switch_core_session_strdup(session, use_ip); engine->adv_sdp_ip = smh->mparams->adv_sdp_audio_ip = smh->mparams->extrtpip = switch_core_session_strdup(session, use_ip);