Commit d7689b13 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Fix maximum value vs. value count for SEQNO_SPACE and TIMESTAMP_SPACE.

parent 54e839ad

prrt/defines.h

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 


#define MAX_PAYLOAD_LENGTH 65507 // maximum UDP packet length (2^16 - 1 - 8 (UDP Header) - 20 (IP Header))



#define SEQNO_SPACE UINT16_MAX // 2**16 as seqno is uint16_t

#define SEQNO_SPACE (UINT16_MAX+1) // 2**16 as seqno is uint16_t



#define TIMESTAMP_SPACE UINT32_MAX

#define TIMESTAMP_SPACE (UINT32_MAX+1)



#define GF_BITS 8

prrt/proto/stores/packetDeliveryStore.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void PrrtPacketDeliveryStore_cleanup(PrrtPacketDeliveryStore *store, prrtTimesta 
        BPTree_get_range(store->tree, packetList, now - TIMESTAMP_SPACE/2, now);

    } else {

        BPTree_get_range(store->tree, packetList, 0, now);

        BPTree_get_range(store->tree, packetList, now + TIMESTAMP_SPACE/2, TIMESTAMP_SPACE);

        BPTree_get_range(store->tree, packetList, now + TIMESTAMP_SPACE/2, TIMESTAMP_SPACE - 1);

    }

    while (List_count(packetList) > 0) {

        PrrtPacket *packet = List_shift(packetList);

prrt/proto/types/channelStateInformation.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ PrrtChannelStateInformation * PrrtChannelStateInformation_create() 


    check(pthread_mutex_init(&csi->lock, NULL) == 0, "Mutex init failed.");



    csi->rtprop = TIMESTAMP_SPACE;

    csi->rtprop = TIMESTAMP_SPACE - 1;

    csi->rtprop_filter_length_us = 2 * 1000 * 1000; // 2 seconds

    csi->deliveryRate = 0;

prrt/util/time.c

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ int64_t PrrtTimestamp_cmp(prrtTimestamp_t a, prrtTimestamp_t b) { 
    if (diff < TIMESTAMP_SPACE / 2) {

        return diff;

    } else {

        return ((int64_t)diff) - ((int64_t)(TIMESTAMP_SPACE) + 1);

        return ((int64_t)diff) - ((int64_t)(TIMESTAMP_SPACE));

    }

}
 
 No newline at end of file

prrt/proto/stores/repairBlockStore.c

+1 −1

File changed.

Contains only whitespace changes.