Btlbw is now also available at the receiver.

prrt/proto/channelStateInformation.c

@@ -33,9 +33,9 @@ void PrrtChannelStateInformation_update_plr(PrrtChannelStateInformation *csi, pr
 }
 
 
-void PrrtChannelStateInformation_update_delivery_rate(PrrtChannelStateInformation *csi, PrrtRateSample *rateSample) {
+void PrrtChannelStateInformation_update_delivery_rate(PrrtChannelStateInformation *csi, prrtDeliveryRate_t rate) {
     pthread_mutex_lock(&csi->lock);
-    csi->deliveryRate = rateSample->delivery_rate;
+    csi->deliveryRate = rate;
     pthread_mutex_unlock(&csi->lock);
 }
 void PrrtChannelStateInformation_update_app_limited(PrrtChannelStateInformation *csi, bool appLimited) {

prrt/proto/channelStateInformation.h

@@ -22,7 +22,7 @@ bool PrrtChannelStateInformation_get_app_limited(PrrtChannelStateInformation *cs
 prrtPacketLossRate_t PrrtChannelStateInformation_get_plr(PrrtChannelStateInformation* csi);
 void PrrtChannelStateInformation_update_plr(PrrtChannelStateInformation *csi, prrtSequenceNumber_t erasures,
                                                    prrtSequenceNumber_t packets);
-void PrrtChannelStateInformation_update_delivery_rate(PrrtChannelStateInformation *csi, PrrtRateSample *rate);
+void PrrtChannelStateInformation_update_delivery_rate(PrrtChannelStateInformation *csi, prrtDeliveryRate_t rate);
 void PrrtChannelStateInformation_update_app_limited(PrrtChannelStateInformation *csi, bool appLimited);
 bool PrrtChannelStateInformation_destroy(PrrtChannelStateInformation* csi);
 

prrt/proto/processes/dataReceiver.c

@@ -141,6 +141,7 @@ handle_data_packet(PrrtSocket *sock_ptr, PrrtPacket *packet) {
                false) {
         PrrtPacket_destroy(packet);
     } else {
+        PrrtChannelStateInformation_update_delivery_rate(sock_ptr->senderChannelStateInformation, payload->btlbw);
         prrtSequenceNumber_t baseSequenceNumber = packet->sequenceNumber - packet->index;
 
         PrrtPacket *reference = PrrtPacket_copy(packet);

prrt/proto/processes/dataTransmitter.c

@@ -117,6 +117,7 @@ static bool send_packet(PrrtSocket *sock_ptr, PrrtPacket *packet) {
     // Update timestamp
     if(PrrtPacket_type(packet) == PACKET_TYPE_DATA) {
         ((PrrtPacketDataPayload*) (packet->payload))->timestamp = PrrtClock_get_current_time_us();
+        ((PrrtPacketDataPayload*) (packet->payload))->btlbw = BBR_getBtlBw(sock_ptr->receiver->bbr);
     } else if(PrrtPacket_type(packet) == PACKET_TYPE_REDUNDANCY) {
         ((PrrtPacketRedundancyPayload*) (packet->payload))->timestamp = PrrtClock_get_current_time_us();
     }

prrt/proto/receiver.c

@@ -190,7 +190,7 @@ void PrrtReceiver_on_ack(PrrtReceiver *receiver, PrrtPacketFeedbackPayload * fee
 
     bool valid_sample = PrrtReceiver_updateAndGenerateRateSample(receiver, feedbackPayload->ackSequenceNumber, feedbackPayload->ackPacketType, receiveTime, rtt);
     if(valid_sample) {
-        PrrtChannelStateInformation_update_delivery_rate(receiver->csi, receiver->rateSample);
+        PrrtChannelStateInformation_update_delivery_rate(receiver->csi, receiver->rateSample->delivery_rate);
     }
     PrrtChannelStateInformation_update_app_limited(receiver->csi, receiver->rateSample->is_app_limited);
 

prrt/proto/socket.c

@@ -227,6 +227,7 @@ bool PrrtSocket_bind(PrrtSocket *s, const char *ipAddress, const uint16_t port)
               EXIT_SUCCESS,
               "Cannot create send thread.");
     } else {
+        s->senderChannelStateInformation = PrrtChannelStateInformation_create();
         s->receiveDataThreadAttr = calloc(1, sizeof(pthread_attr_t));
         pthread_attr_init(s->receiveDataThreadAttr);
         if(s->isThreadPinning) {
@@ -452,6 +453,11 @@ int PrrtSocket_close(PrrtSocket *s) {
         s->redundancyReceptionTable = NULL;
     }
 
+    if(s->senderChannelStateInformation != NULL) {
+        PrrtChannelStateInformation_destroy(s->senderChannelStateInformation);
+        s->senderChannelStateInformation = NULL;
+    }
+
     if (s->packetDeliveryStore != NULL) {
         PrrtPacketDeliveryStore_destroy(s->packetDeliveryStore);
         s->packetDeliveryStore = NULL;
@@ -609,7 +615,11 @@ prrtDeliveryRate_t PrrtSocket_get_delivery_rate(PrrtSocket *s) {
 }
 
 prrtDeliveryRate_t PrrtSocket_get_btlbw(PrrtSocket *s) {
-    return BBR_getBtlBw(s->receiver->bbr);
+    if(s->isSender) {
+        return BBR_getBtlBw(s->receiver->bbr);
+    } else {
+        return PrrtChannelStateInformation_get_delivery_rate(s->senderChannelStateInformation);
+    }
 }
 
 uint32_t PrrtSocket_get_bbr_state(PrrtSocket *s) {

prrt/proto/socket.h

@@ -86,6 +86,8 @@ typedef struct prrtSocket {
     atomic_bool isHardwareTimestamping;
     char *interfaceName;
 
+    PrrtChannelStateInformation* senderChannelStateInformation;
+
     atomic_bool isThreadPinning;
 } PrrtSocket;
 

prrt/proto/types/packet.c

@@ -243,6 +243,10 @@ void *encode_data_header(void *buf_ptr, const void *payload) {
     *packet_timeout = htonl(data_payload->packetTimeout_us);
     buf_ptr += sizeof(prrtTimedelta_t);
 
+    prrtDeliveryRate_t *deliveryRate = (prrtDeliveryRate_t *) buf_ptr;
+    *deliveryRate = htonl(data_payload->btlbw);
+    buf_ptr += sizeof(prrtDeliveryRate_t);
+
     return buf_ptr;
 }
 
@@ -384,6 +388,10 @@ void *decode_data_header(void *dstBuffer, const void *srcBuffer) {
     data_payload->packetTimeout_us = ntohl(*packet_timeout);
     dstBuffer += sizeof(prrtTimedelta_t);
 
+    prrtDeliveryRate_t *btlbw = (prrtDeliveryRate_t *) dstBuffer;
+    data_payload->btlbw = ntohl(*btlbw);
+    dstBuffer += sizeof(prrtDeliveryRate_t);
+
     return dstBuffer;
 }
 

prrt/proto/types/packet.h

@@ -57,6 +57,7 @@ typedef struct prrtPacketDataPayload {
     prrtTimestamp_t timestamp;
     prrtTimedelta_t groupRTprop_us;
     prrtTimestamp_t packetTimeout_us;
+    prrtDeliveryRate_t btlbw;
 } PrrtPacketDataPayload;
 #define PRRT_PACKET_DATA_HEADER_SIZE sizeof(PrrtPacketDataPayload)
 

prrt/prrt.pyx

@@ -190,8 +190,6 @@ cdef class PrrtSocket:
 
     property btlbw:
         def __get__(self):
-            if not self.isSender:
-                raise Exception("Not a sender.")
             return cprrt.PrrtSocket_get_btlbw(self._c_socket)
 
     property bbr_state: