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

Merged revisions 69992 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69992 | file | 2007-06-19 13:00:58 -0400 (Tue, 19 Jun 2007) | 2 lines

Handle the CC field in the RTP header. (issue #9384 reported by DoodleHu)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@70003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-19 17:07:40 +00:00
parent 217d6f80ea
commit 8b71bbd6ed
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main/rtp.c
View File

@@ -1047,18 +1047,13 @@ static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int t
/*! \brief Perform a Packet2Packet RTP write */ /*! \brief Perform a Packet2Packet RTP write */
static int bridge_p2p_rtp_write(struct ast_rtp *rtp, struct ast_rtp *bridged, unsigned int *rtpheader, int len, int hdrlen) static int bridge_p2p_rtp_write(struct ast_rtp *rtp, struct ast_rtp *bridged, unsigned int *rtpheader, int len, int hdrlen)
{ {
int res = 0, payload = 0, bridged_payload = 0, version, padding, mark, ext; int res = 0, payload = 0, bridged_payload = 0, mark;
struct rtpPayloadType rtpPT; struct rtpPayloadType rtpPT;
unsigned int seqno; int reconstruct = ntohl(rtpheader[0]);
/* Get fields from packet */ /* Get fields from packet */
seqno = ntohl(rtpheader[0]); payload = (reconstruct & 0x7f0000) >> 16;
version = (seqno & 0xC0000000) >> 30; mark = (((reconstruct & 0x800000) >> 23) != 0);
payload = (seqno & 0x7f0000) >> 16;
padding = seqno & (1 << 29);
mark = (seqno & 0x800000) >> 23;
ext = seqno & (1 << 28);
seqno &= 0xffff;
/* Check what the payload value should be */ /* Check what the payload value should be */
rtpPT = ast_rtp_lookup_pt(rtp, payload); rtpPT = ast_rtp_lookup_pt(rtp, payload);
@@ -1077,7 +1072,10 @@ static int bridge_p2p_rtp_write(struct ast_rtp *rtp, struct ast_rtp *bridged, un
} }
/* Reconstruct part of the packet */ /* Reconstruct part of the packet */
rtpheader[0] = htonl((version << 30) | (mark << 23) | (bridged_payload << 16) | (seqno)); reconstruct &= 0xFF80FFFF;
reconstruct |= (bridged_payload << 16);
reconstruct |= (mark << 23);
rtpheader[0] = htonl(reconstruct);
/* Send the packet back out */ /* Send the packet back out */
res = sendto(bridged->s, (void *)rtpheader, len, 0, (struct sockaddr *)&bridged->them, sizeof(bridged->them)); res = sendto(bridged->s, (void *)rtpheader, len, 0, (struct sockaddr *)&bridged->them, sizeof(bridged->them));
@@ -1108,6 +1106,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
int padding; int padding;
int mark; int mark;
int ext; int ext;
int cc;
unsigned int ssrc; unsigned int ssrc;
unsigned int timestamp; unsigned int timestamp;
unsigned int *rtpheader; unsigned int *rtpheader;
@@ -1186,6 +1185,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
padding = seqno & (1 << 29); padding = seqno & (1 << 29);
mark = seqno & (1 << 23); mark = seqno & (1 << 23);
ext = seqno & (1 << 28); ext = seqno & (1 << 28);
cc = (seqno & 0xF000000) >> 24;
seqno &= 0xffff; seqno &= 0xffff;
timestamp = ntohl(rtpheader[1]); timestamp = ntohl(rtpheader[1]);
ssrc = ntohl(rtpheader[2]); ssrc = ntohl(rtpheader[2]);
@@ -1203,10 +1203,15 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
res -= rtp->rawdata[AST_FRIENDLY_OFFSET + res - 1]; res -= rtp->rawdata[AST_FRIENDLY_OFFSET + res - 1];
} }
if (cc) {
/* CSRC fields present */
hdrlen += cc*4;
}
if (ext) { if (ext) {
/* RTP Extension present */ /* RTP Extension present */
hdrlen += (ntohl(rtpheader[hdrlen/4]) & 0xffff) << 2;
hdrlen += 4; hdrlen += 4;
hdrlen += (ntohl(rtpheader[3]) & 0xffff) << 2;
} }
if (res < hdrlen) { if (res < hdrlen) {