aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_iax.c
diff options
context:
space:
mode:
authormatteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b>2003-03-18 06:00:18 +0000
committermatteo <matteo@f38db490-d61c-443f-a65b-d21fe96a405b>2003-03-18 06:00:18 +0000
commit15d2f7aa97d8aeb5c079eb0f8f12e34566cc25e3 (patch)
treef8415b483851763c16dc9983cd34c8bb265982d9 /channels/chan_iax.c
parent5ed6a971dafbe158e7406bc15694187df80047c4 (diff)
Tue Mar 18 07:00:01 CET 2003
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@652 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax.c')
-rwxr-xr-xchannels/chan_iax.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 3cf6813dd..894aa67c2 100755
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -3409,7 +3409,6 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
char rel0[256];
char rel1[255];
char empty[32]=""; /* Safety measure */
- fr.ts=0; /* make Valgrind happy */
res = recvfrom(netsocket, buf, sizeof(buf), 0,(struct sockaddr *) &sin, &len);
if (res < 0) {
if (errno != ECONNREFUSED)
@@ -3473,6 +3472,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
ast_log(LOG_DEBUG, "Received packet %d, (%d, %d)\n", ntohs(fh->seqno), f.frametype, f.subclass);
/* Check if it's out of order (and not an ACK or INVAL) */
fr.seqno = ntohs(fh->seqno);
+ fr.ts = ntohl(fh->ts);
if ((iaxs[fr.callno]->iseqno != fr.seqno) &&
(iaxs[fr.callno]->iseqno ||
((f.subclass != AST_IAX_COMMAND_TXCNT) &&
@@ -3525,7 +3525,6 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
f.data = buf + sizeof(struct ast_iax_full_hdr);
else
f.data = empty;
- fr.ts = ntohl(fh->ts);
/* Unless this is an ACK or INVAL frame, ack it */
if ((f.frametype != AST_FRAME_IAX) ||
((f.subclass != AST_IAX_COMMAND_ACK) &&