[Asterisk-cvs] asterisk rtp.c,1.110,1.111

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv19033

Modified Files:
	rtp.c 
Log Message:
Revert earlier timestamp stuff pending contact with Intel over apparent HMP brokenness


Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- rtp.c	27 Feb 2005 05:59:24 -0000	1.110
+++ rtp.c	27 Feb 2005 16:43:32 -0000	1.111
@@ -85,7 +85,6 @@
 	int dtmfcount;
 	unsigned int dtmfduration;
 	int nat;
-	int digitssent;
 	int flags;
 	struct sockaddr_in us;
 	struct sockaddr_in them;
@@ -1011,7 +1010,6 @@
 	memset(&rtp->dtmfmute, 0, sizeof(rtp->dtmfmute));
 	rtp->lastts = 0;
 	rtp->lastrxts = 0;
-	rtp->digitssent = 0;
 	rtp->lastividtimestamp = 0;
 	rtp->lastovidtimestamp = 0;
 	rtp->lasteventseqn = 0;
@@ -1103,14 +1101,10 @@
 	
 	/* Get a pointer to the header */
 	rtpheader = (unsigned int *)data;
-	rtpheader[0] = htonl((2 << 30) | (1 << 23) | (payload << 16) | rtp->seqno);
-	rtpheader[1] = htonl(rtp->lastts + (rtp->digitssent * 160));
+	rtpheader[0] = htonl((2 << 30) | (1 << 23) | (payload << 16) | (rtp->seqno++));
+	rtpheader[1] = htonl(rtp->lastts);
 	rtpheader[2] = htonl(rtp->ssrc); 
 	rtpheader[3] = htonl((digit << 24) | (0xa << 16) | (0));
-
-	rtp->seqno++;
-	rtp->digitssent++;
-
 	for (x=0;x<6;x++) {
 		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));
@@ -1278,7 +1272,6 @@
 	put_uint32(rtpheader + 4, htonl(rtp->lastts));
 	put_uint32(rtpheader + 8, htonl(rtp->ssrc)); 
 
-	rtp->digitssent = 0;
 	rtp->seqno++;
 
 	if (rtp->them.sin_port && rtp->them.sin_addr.s_addr) {