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

Revert earlier timestamp stuff pending contact with Intel over apparent HMP brokenness

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-27 16:43:32 +00:00
parent 618b325d73
commit 78b9e92af9
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtp.c
View File

@@ -85,7 +85,6 @@ struct ast_rtp {
int dtmfcount; int dtmfcount;
unsigned int dtmfduration; unsigned int dtmfduration;
int nat; int nat;
int digitssent;
int flags; int flags;
struct sockaddr_in us; struct sockaddr_in us;
struct sockaddr_in them; struct sockaddr_in them;
@@ -1011,7 +1010,6 @@ void ast_rtp_reset(struct ast_rtp *rtp)
memset(&rtp->dtmfmute, 0, sizeof(rtp->dtmfmute)); memset(&rtp->dtmfmute, 0, sizeof(rtp->dtmfmute));
rtp->lastts = 0; rtp->lastts = 0;
rtp->lastrxts = 0; rtp->lastrxts = 0;
rtp->digitssent = 0;
rtp->lastividtimestamp = 0; rtp->lastividtimestamp = 0;
rtp->lastovidtimestamp = 0; rtp->lastovidtimestamp = 0;
rtp->lasteventseqn = 0; rtp->lasteventseqn = 0;
@@ -1103,14 +1101,10 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
/* Get a pointer to the header */ /* Get a pointer to the header */
rtpheader = (unsigned int *)data; rtpheader = (unsigned int *)data;
rtpheader[0] = htonl((2 << 30) | (1 << 23) | (payload << 16) | rtp->seqno); rtpheader[0] = htonl((2 << 30) | (1 << 23) | (payload << 16) | (rtp->seqno++));
rtpheader[1] = htonl(rtp->lastts + (rtp->digitssent * 160)); rtpheader[1] = htonl(rtp->lastts);
rtpheader[2] = htonl(rtp->ssrc); rtpheader[2] = htonl(rtp->ssrc);
rtpheader[3] = htonl((digit << 24) | (0xa << 16) | (0)); rtpheader[3] = htonl((digit << 24) | (0xa << 16) | (0));
rtp->seqno++;
rtp->digitssent++;
for (x=0;x<6;x++) { for (x=0;x<6;x++) {
if (rtp->them.sin_port && rtp->them.sin_addr.s_addr) { if (rtp->them.sin_port && rtp->them.sin_addr.s_addr) {
res = sendto(rtp->s, (void *)rtpheader, hdrlen + 4, 0, (struct sockaddr *)&rtp->them, sizeof(rtp->them)); res = sendto(rtp->s, (void *)rtpheader, hdrlen + 4, 0, (struct sockaddr *)&rtp->them, sizeof(rtp->them));
@@ -1278,7 +1272,6 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
put_uint32(rtpheader + 4, htonl(rtp->lastts)); put_uint32(rtpheader + 4, htonl(rtp->lastts));
put_uint32(rtpheader + 8, htonl(rtp->ssrc)); put_uint32(rtpheader + 8, htonl(rtp->ssrc));
rtp->digitssent = 0;
rtp->seqno++; rtp->seqno++;
if (rtp->them.sin_port && rtp->them.sin_addr.s_addr) { if (rtp->them.sin_port && rtp->them.sin_addr.s_addr) {