X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=9e5ef4654b3cc0ce007374cefe36724d67159986;hp=b35f72d4aa744657ab95691cd6adf6b5d9fb07d7;hb=d91903ef3c2a1f4481ae8757bb2b14282f2b7e68;hpb=23acc19bc090051156ad895caed61848f5afb144

diff --git a/src/net_packet.c b/src/net_packet.c
index b35f72d4..9e5ef465 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -3,6 +3,7 @@
     Copyright (C) 1998-2005 Ivo Timmermans,
                   2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2010      Timothy Redaelli <timothy@redaelli.eu>
+                  2010      Brandon Black <blblack@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -298,9 +299,13 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 	if(replaywin) {
 		if(inpkt->seqno != n->received_seqno + 1) {
 			if(inpkt->seqno >= n->received_seqno + replaywin * 8) {
+				if(n->farfuture++ < replaywin >> 2) {
+					logger(LOG_WARNING, "Packet from %s (%s) is %d seqs in the future, dropped (%u)",
+						n->name, n->hostname, inpkt->seqno - n->received_seqno - 1, n->farfuture);
+					return;
+				}
 				logger(LOG_WARNING, "Lost %d packets from %s (%s)",
 					   	inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
-				
 				memset(n->late, 0, replaywin);
 			} else if (inpkt->seqno <= n->received_seqno) {
 				if((n->received_seqno >= replaywin * 8 && inpkt->seqno <= n->received_seqno - replaywin * 8) || !(n->late[(inpkt->seqno / 8) % replaywin] & (1 << inpkt->seqno % 8))) {
@@ -313,7 +318,8 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 					n->late[(i / 8) % replaywin] |= 1 << i % 8;
 			}
 		}
-	
+
+		n->farfuture = 0;
 		n->late[(inpkt->seqno / 8) % replaywin] &= ~(1 << inpkt->seqno % 8);
 	}