kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 281532 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2010-08-10 16:55:50 +00:00
parent e287e4090c
commit e8aea605dc
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_sip.c
View File

@@ -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));
}