Fix the replay window in SPTPS.

[tinc] / src / sptps.c

diff --git a/src/sptps.c b/src/sptps.c
index 7206934..62cfb1f 100644 (file)
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -400,7 +400,7 @@ static bool receive_handshake(sptps_t *s, const char *data, uint16_t len) {
                        return true;
                // TODO: split ACK into a VERify and ACK?
                default:
-                       return error(s, EIO, "Invalid session state");
+                       return error(s, EIO, "Invalid session state %d", s->state);
        }
 }
 
@@ -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.
                                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) {
                                // 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)))
@@ -483,7 +484,7 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
                s->farfuture = 0;
        }
 
-       if(seqno > s->inseqno)
+       if(seqno >= s->inseqno)
                s->inseqno = seqno + 1;
 
        if(!s->inseqno)
@@ -512,7 +513,7 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
                if(!receive_handshake(s, buffer + 7, len - 21))
                        return false;
        } else {
-               return error(s, EIO, "Invalid record type");
+               return error(s, EIO, "Invalid record type %d", type);
        }
 
        return true;
@@ -521,7 +522,7 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
 // Receive incoming data. Check if it contains a complete record, if so, handle it.
 bool sptps_receive_data(sptps_t *s, const char *data, size_t len) {
        if(!s->state)
-               return error(s, EIO, "Invalid session state");
+               return error(s, EIO, "Invalid session state zero");
 
        if(s->datagram)
                return sptps_receive_data_datagram(s, data, len);
@@ -605,7 +606,7 @@ bool sptps_receive_data(sptps_t *s, const char *data, size_t len) {
                        if(!receive_handshake(s, s->inbuf + 7, s->reclen))
                                return false;
                } else {
-                       return error(s, EIO, "Invalid record type");
+                       return error(s, EIO, "Invalid record type %d", type);
                }
 
                s->buflen = 4;
@@ -629,6 +630,7 @@ bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_
                s->late = malloc(s->replaywin);
                if(!s->late)
                        return error(s, errno, strerror(errno));
+               memset(s->late, 0, s->replaywin);
        }
 
        s->label = malloc(labellen);