kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +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@13130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-15 19:05:45 +00:00
parent 5e338e72ba
commit ca6ae319c7
1 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rtp.c
View File

@@ -1129,7 +1129,6 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
int hdrlen = 12; int hdrlen = 12;
int res; int res;
int x; int x;
unsigned short duration = 0;
int payload; int payload;
char data[256]; char data[256];
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
@@ -1162,8 +1161,7 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
rtpheader[1] = htonl(rtp->lastdigitts); rtpheader[1] = htonl(rtp->lastdigitts);
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));
for (x = 0; x < 6; x++) {
for (x = 0; x < 5; 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));
if (res < 0) if (res < 0)
@@ -1175,48 +1173,35 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr), ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr),
ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
} }
/* Sequence number of last two end packets does not get incremented */
/* Sequence number must be incremented for every packet */ if (x < 3)
rtp->seqno++; rtp->seqno++;
/* Clear marker bit and set seqno */ /* Clear marker bit and set seqno */
rtpheader[0] = htonl((2 << 30) | (payload << 16) | (rtp->seqno)); rtpheader[0] = htonl((2 << 30) | (payload << 16) | (rtp->seqno));
/* Increment duration for 160 (20ms) */ /* For the last three packets, set the duration and the end bit */
duration += 160; if (x == 2) {
rtpheader[3] = htonl((digit << 24) | (0xa << 16) | (duration)); #if 0
} /* No, this is wrong... Do not increment lastdigitts, that's not according
to the RFC, as best we can determine */
rtp->lastdigitts++; /* or else the SPA3000 will click instead of beeping... */
rtpheader[1] = htonl(rtp->lastdigitts);
#endif
/* Make duration 800 (100ms) */
rtpheader[3] |= htonl((800));
/* Set the End bit */ /* Set the End bit */
rtpheader[3] |= htonl((1 << 23)); rtpheader[3] |= htonl((1 << 23));
/* Send last packet and repeat it 2 times */
for (x = 0; x < 3; 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));
if (res < 0) {
ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr),
ntohs(rtp->them.sin_port), strerror(errno));
}
if (rtp_debug_test_addr(&rtp->them)) {
ast_verbose("Sent RTP packet to %s:%d (type %d, seq %u, ts %u, len %u)\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr),
ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
} }
} }
/* Sequence number must be incremented for every packet, even for retransmitted last two packets */
rtp->seqno++;
/* Set seqno */
rtpheader[0] = htonl((2 << 30) | (payload << 16) | (rtp->seqno));
}
/* Increment the digit timestamp by 120ms, to ensure that digits /* Increment the digit timestamp by 120ms, to ensure that digits
sent sequentially with no intervening non-digit packets do not sent sequentially with no intervening non-digit packets do not
get sent with the same timestamp, and that sequential digits get sent with the same timestamp, and that sequential digits
have some 'dead air' in between them have some 'dead air' in between them
*/ */
duration += 160; rtp->lastdigitts += 960;
rtp->lastdigitts += duration; /* Increment the sequence number to reflect the last packet
that was sent
*/
rtp->seqno++;
return 0; return 0;
} }