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

properly strip incoming padded RTP frames (bug #4264)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-05-14 23:41:12 +00:00
parent d825e581f3
commit 23d7376f4d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtp.c
View File

@@ -429,6 +429,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
int version; int version;
int payloadtype; int payloadtype;
int hdrlen = 12; int hdrlen = 12;
int padding;
int mark; int mark;
int ext; int ext;
int x; int x;
@@ -482,10 +483,17 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
return &null_frame; return &null_frame;
payloadtype = (seqno & 0x7f0000) >> 16; payloadtype = (seqno & 0x7f0000) >> 16;
padding = seqno & (1 << 29);
mark = seqno & (1 << 23); mark = seqno & (1 << 23);
ext = seqno & (1 << 28); ext = seqno & (1 << 28);
seqno &= 0xffff; seqno &= 0xffff;
timestamp = ntohl(rtpheader[1]); timestamp = ntohl(rtpheader[1]);
if (padding) {
/* Remove padding bytes */
res -= rtp->rawdata[AST_FRIENDLY_OFFSET + res - 1];
}
if (ext) { if (ext) {
/* RTP Extension present */ /* RTP Extension present */
hdrlen += 4; hdrlen += 4;