X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=reorderer.cpp;h=71b90c54d7433308ea0684574768b6bd990ecfa5;hb=7019fcdc8632b5740798e8345b48e23640e2de1b;hp=c2823e5254c94a85c7201d61efbb613d27d88073;hpb=3f954bd32d89c220993d14782e73decc5f567abd;p=greproxy diff --git a/reorderer.cpp b/reorderer.cpp index c2823e5..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; } @@ -70,9 +70,9 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq) 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;