diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-08-10 16:55:50 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-08-10 16:55:50 +0000 |
| commit | e8aea605dc07821dc5c33d17595182da906c28f8 (patch) | |
| tree | 70b8f57fa78620f6cb99ba8f1cdb18a81a6b987f | |
| parent | e287e4090cae8eceea5667565a5edf137a35ba9d (diff) | |
Merged revisions 281532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r281532 | russell | 2010-08-10 11:54:20 -0500 (Tue, 10 Aug 2010) | 8 lines
Ensure that the proper external address is used for the RTP destination.
(closes issue #17044)
Reported by: ebroad
Tested by: ebroad
Review: https://reviewboard.asterisk.org/r/566/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 350dc5306..d4e9f0af8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10262,6 +10262,8 @@ static void get_our_media_address(struct sip_pvt *p, int needvideo, int needtext struct ast_sockaddr *taddr, struct ast_sockaddr *dest, struct ast_sockaddr *vdest, struct ast_sockaddr *tdest) { + int use_externip = 0; + /* First, get our address */ ast_rtp_instance_get_local_address(p->rtp, addr); if (p->vrtp) { @@ -10271,6 +10273,11 @@ static void get_our_media_address(struct sip_pvt *p, int needvideo, int needtext ast_rtp_instance_get_local_address(p->trtp, taddr); } + /* If our real IP differs from the local address returned by the RTP engine, use it. */ + /* The premise is that if we are already using that IP to communicate with the client, */ + /* we should be using it for RTP too. */ + use_externip = ast_sockaddr_cmp_addr(&p->ourip, addr); + /* Now, try to figure out where we want them to send data */ /* Is this a re-invite to move the media out, then use the original offer from caller */ if (!ast_sockaddr_isnull(&p->redirip)) { /* If we have a redirection IP, use it */ @@ -10289,7 +10296,7 @@ static void get_our_media_address(struct sip_pvt *p, int needvideo, int needtext */ ast_sockaddr_copy(dest, !ast_sockaddr_isnull(&media_address) ? &media_address : - !ast_sockaddr_is_any(addr) ? addr : + !ast_sockaddr_is_any(addr) && !use_externip ? addr : &p->ourip); ast_sockaddr_set_port(dest, ast_sockaddr_port(addr)); } @@ -10312,7 +10319,7 @@ static void get_our_media_address(struct sip_pvt *p, int needvideo, int needtext */ ast_sockaddr_copy(vdest, !ast_sockaddr_isnull(&media_address) ? &media_address : - !ast_sockaddr_is_any(vaddr) ? vaddr : + !ast_sockaddr_is_any(vaddr) && !use_externip ? vaddr : &p->ourip); ast_sockaddr_set_port(vdest, ast_sockaddr_port(vaddr)); } @@ -10336,7 +10343,7 @@ static void get_our_media_address(struct sip_pvt *p, int needvideo, int needtext */ ast_sockaddr_copy(tdest, !ast_sockaddr_isnull(&media_address) ? &media_address : - !ast_sockaddr_is_any(taddr) ? taddr : + !ast_sockaddr_is_any(taddr) && !use_externip ? taddr : &p->ourip); ast_sockaddr_set_port(tdest, ast_sockaddr_port(taddr)); } |