j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix the replay window in SPTPS.

Browse source
This commit is contained in:
Guus Sliepen 2013-08-30 14:22:05 +02:00
parent c7752ca73e
commit ccbf70b66f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sptps.c
View file

@ -466,7 +466,8 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
// Unless we have seen lots of them, in which case we consider the others lost. // Unless we have seen lots of them, in which case we consider the others lost.
warning(s, "Lost %d packets\n", seqno - s->inseqno); warning(s, "Lost %d packets\n", seqno - s->inseqno);
memset(s->late, 0, s->replaywin); // Mark all packets in the replay window as being late.
memset(s->late, 255, s->replaywin);
} else if (seqno < s->inseqno) { } else if (seqno < s->inseqno) {
// If the sequence number is farther in the past than the bitmap goes, or if the packet was already received, drop it. // If the sequence number is farther in the past than the bitmap goes, or if the packet was already received, drop it.
if((s->inseqno >= s->replaywin * 8 && seqno < s->inseqno - s->replaywin * 8) || !(s->late[(seqno / 8) % s->replaywin] & (1 << seqno % 8))) if((s->inseqno >= s->replaywin * 8 && seqno < s->inseqno - s->replaywin * 8) || !(s->late[(seqno / 8) % s->replaywin] & (1 << seqno % 8)))
@ -483,7 +484,7 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
s->farfuture = 0; s->farfuture = 0;
} }
if(seqno > s->inseqno) if(seqno >= s->inseqno)
s->inseqno = seqno + 1; s->inseqno = seqno + 1;
if(!s->inseqno) if(!s->inseqno)
@ -629,6 +630,7 @@ bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_
s->late = malloc(s->replaywin); s->late = malloc(s->replaywin);
if(!s->late) if(!s->late)
return error(s, errno, strerror(errno)); return error(s, errno, strerror(errno));
memset(s->late, 0, s->replaywin);
} }
s->label = malloc(labellen); s->label = malloc(labellen);