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

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@26798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-11 09:10:58 +00:00
parent d83e489d61
commit e9ee611581
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtp.c
View File

@@ -90,6 +90,7 @@ struct ast_rtp {
unsigned char rawdata[8192 + AST_FRIENDLY_OFFSET];
/*! Synchronization source, RFC 3550, page 10. */
unsigned int ssrc;
unsigned int rxssrc;
unsigned int lastts;
unsigned int lastdigitts;
unsigned int lastrxts;
@@ -440,6 +441,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
int ext;
int x;
char iabuf[INET_ADDRSTRLEN];
unsigned int ssrc;
unsigned int timestamp;
unsigned int *rtpheader;
static struct ast_frame *f, null_frame = { AST_FRAME_NULL, };
@@ -496,6 +498,14 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
ext = seqno & (1 << 28);
seqno &= 0xffff;
timestamp = ntohl(rtpheader[1]);
ssrc = ntohl(rtpheader[2]);
if (!mark && rtp->rxssrc && rtp->rxssrc != ssrc) {
ast_log(LOG_WARNING, "Forcing Marker bit, because SSRC has changed\n");
mark = 1;
}
rtp->rxssrc = ssrc;
if (padding) {
/* Remove padding bytes */