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

Move the direct bridge write to after the NAT handling code

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-08-29 23:41:16 +00:00
parent 3f189742f6
commit a2e2a51d8d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/rtp.c
View File

@@ -1042,15 +1042,12 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
return &ast_null_frame; return &ast_null_frame;
} }
if (version != 2) /* If we don't have the other side's address, then ignore this */
return &ast_null_frame;
/* Ignore if the other side hasn't been given an address
yet. */
if (!rtp->them.sin_addr.s_addr || !rtp->them.sin_port) if (!rtp->them.sin_addr.s_addr || !rtp->them.sin_port)
return &ast_null_frame; return &ast_null_frame;
/* Send to whoever send to us if NAT is turned on */
if (rtp->nat) { if (rtp->nat) {
/* Send to whoever sent to us */
if ((rtp->them.sin_addr.s_addr != sin.sin_addr.s_addr) || if ((rtp->them.sin_addr.s_addr != sin.sin_addr.s_addr) ||
(rtp->them.sin_port != sin.sin_port)) { (rtp->them.sin_port != sin.sin_port)) {
rtp->them = sin; rtp->them = sin;
@@ -1065,6 +1062,13 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
} }
} }
/* If we are bridged to another RTP stream, send direct */
if (rtp->bridged && !bridge_p2p_write(rtp, rtpheader, res, hdrlen))
return &ast_null_frame;
if (version != 2)
return &ast_null_frame;
payloadtype = (seqno & 0x7f0000) >> 16; payloadtype = (seqno & 0x7f0000) >> 16;
padding = seqno & (1 << 29); padding = seqno & (1 << 29);
mark = seqno & (1 << 23); mark = seqno & (1 << 23);