X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=reorderer.cpp;h=051280287c7754d066c71906438923de610131a6;hb=a8e9b75339d48294145a9b102e43046a10b0bc36;hp=7b19d1d3435ab9e5b1ba702b38c6e70d295e3408;hpb=1bacf4bb3d9dbd9f07e33b5676f5a1be43cd83a5;p=greproxy

diff --git a/reorderer.cpp b/reorderer.cpp
index 7b19d1d..0512802 100644
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -3,8 +3,8 @@
 #include "reorderer.h"
 #include "protocol.h"
 
-#define PACKET_BUFFER_SIZE 100
-#define TIMEOUT_SEC 0.100
+#define PACKET_BUFFER_SIZE 1000
+#define TIMEOUT_SEC 1.000
 
 using namespace std;
 
@@ -17,6 +17,7 @@ double tdiff(const timeval& a, const timeval& b)
 Reorderer::Reorderer(Sender* sender)
 	: sender(sender), last_seq(-1)
 {
+	gettimeofday(&last_sent_packet, NULL);
 }
 
 void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
@@ -40,6 +41,14 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 		// in case there are more timeouts.
 	}
 
+	// In case of restarts.
+	if (packet_buffer.empty() &&
+	    seq < last_seq &&
+	    tdiff(last_sent_packet, now) > 5.0) {
+		printf("No good data for five seconds, resetting sequence to %d\n", seq);
+		last_seq = seq - 1;
+	}
+
 	GREPacket packet;
 	packet.seq = seq;
 	packet.proto = proto;
@@ -66,6 +75,7 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 		sender->send_packet(proto, data, seq);
 		packet_buffer.pop();
 		last_seq = front_seq;
+		last_sent_packet = now;
 		if (!silence && !packet_buffer.empty()) {
 			printf("Reordering with packet buffer size %d: seq=%d new_front_seq=%d\n", int(packet_buffer.size()), front_seq, packet_buffer.top().seq);
 			silence = true;