diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-05-14 23:41:12 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-05-14 23:41:12 +0000 |
commit | 23d7376f4dc5f25d36594704b859df256fa12e1d (patch) | |
tree | ac08bf19de647db7541c64d73db4799c4eef2978 /rtp.c | |
parent | d825e581f3dfa46dadd4d29122223db6ac843d01 (diff) |
properly strip incoming padded RTP frames (bug #4264)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'rtp.c')
-rwxr-xr-x | rtp.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -429,6 +429,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) int version; int payloadtype; int hdrlen = 12; + int padding; int mark; int ext; int x; @@ -482,10 +483,17 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) return &null_frame; payloadtype = (seqno & 0x7f0000) >> 16; + padding = seqno & (1 << 29); mark = seqno & (1 << 23); ext = seqno & (1 << 28); seqno &= 0xffff; timestamp = ntohl(rtpheader[1]); + + if (padding) { + /* Remove padding bytes */ + res -= rtp->rawdata[AST_FRIENDLY_OFFSET + res - 1]; + } + if (ext) { /* RTP Extension present */ hdrlen += 4; |