X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=reorderer.cpp;h=71b90c54d7433308ea0684574768b6bd990ecfa5;hb=HEAD;hp=2374ffd9dc5f3930b6d72093d9d7394fe71c68e7;hpb=81801e0df8154add73c86f5a536e4c0f668e4d05;p=greproxy

diff --git a/reorderer.cpp b/reorderer.cpp
index 2374ffd..71b90c5 100644
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -30,7 +30,7 @@ void Reorderer::possibly_adjust_tv(timeval *tv)
 	}
 }
 
-void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
+void Reorderer::send_packet(uint16_t proto, const string& data, uint32_t seq)
 {
 	timeval now;
 	gettimeofday(&now, NULL);
@@ -55,7 +55,7 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 	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);
+		printf("No good data for five seconds, resetting sequence to %u\n", seq);
 		last_seq = seq - 1;
 	}
 
@@ -66,11 +66,13 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 	packet.ts = now;
 	packet_buffer.push(packet);
 
+	bool did_reorder = false;
+
 	while (!packet_buffer.empty() &&
 	       (last_seq == -1 || packet_buffer.top().seq <= last_seq + 1)) {
-		int front_seq = packet_buffer.top().seq;
+		uint32_t front_seq = packet_buffer.top().seq;
 		if (front_seq < last_seq + 1) {
-			printf("Duplicate packet or way out-of-order: seq=%d front_seq=%d\n",
+			printf("Duplicate packet or way out-of-order: seq=%u front_seq=%u\n",
 				front_seq, last_seq + 1);
 			packet_buffer.pop();
 			continue;
@@ -87,13 +89,17 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 		last_seq = front_seq;
 		last_sent_packet = now;
 		if (!packet_buffer.empty()) {
-			++num_reorders;
+			did_reorder = true;
 			if (!silence) {
 				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;
 			}
 		}
 	}
+
+	if (did_reorder) {
+		++num_reorders;
+	}
 }
 
 void Reorderer::check_ts_discontinuity(uint16_t proto, const string &data, bool silence)