X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=bb50aa2d982e8cc216d05bae75473eb813b82c42;hp=2a3e5f2ef20e14c63a2884d22b10a5b468809bcc;hb=4fe7aff4d1b8605d4997b842481cc78bd062fe2a;hpb=5373129344d349ff6aeb2b3d21f947f5ecbbcfaf

diff --git a/src/net_packet.c b/src/net_packet.c
index 2a3e5f2e..bb50aa2d 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -231,19 +231,21 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 			
 			memset(n->late, 0, sizeof(n->late));
 		} else if (inpkt->seqno <= n->received_seqno) {
-			if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
+			if((n->received_seqno >= sizeof(n->late) * 8 && inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8) || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
 				logger(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
 					   n->name, n->hostname, inpkt->seqno, n->received_seqno);
 				return;
 			}
 		} else {
 			for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
-				n->late[(inpkt->seqno / 8) % sizeof(n->late)] |= 1 << i % 8;
+				n->late[(i / 8) % sizeof(n->late)] |= 1 << i % 8;
 		}
 	}
 	
-	n->received_seqno = inpkt->seqno;
-	n->late[(n->received_seqno / 8) % sizeof(n->late)] &= ~(1 << n->received_seqno % 8);
+	n->late[(inpkt->seqno / 8) % sizeof(n->late)] &= ~(1 << inpkt->seqno % 8);
+
+	if(inpkt->seqno > n->received_seqno)
+		n->received_seqno = inpkt->seqno;
 			
 	if(n->received_seqno > MAX_SEQNO)
 		keyexpires = 0;