Fix btlbw.

prrt/proto/types/packet.c

@@ -200,10 +200,7 @@ void *encode_data_header(void *buf_ptr, const void *payload) {
     PrrtPacketField_encode(data_payload, buf_ptr, prrtTimestamp_t, timestamp, htonl);
     PrrtPacketField_encode(data_payload, buf_ptr, prrtTimedelta_t, groupRTprop_us, htonl);
     PrrtPacketField_encode(data_payload, buf_ptr, prrtTimestamp_t, packetTimeout_us, htonl);
-
-    prrtDeliveryRate_t *deliveryRate = (prrtDeliveryRate_t *) buf_ptr;
-    *deliveryRate = htonl(data_payload->btlbw);
-    buf_ptr += sizeof(prrtDeliveryRate_t);
+    PrrtPacketField_encode(data_payload, buf_ptr, prrtDeliveryRate_t, btlbw, htonl);
 
     return buf_ptr;
 }
@@ -294,10 +291,7 @@ void *decode_data_header(void *dstBuffer, const void *srcBuffer) {
     PrrtPacketField_decode(data_payload, dstBuffer, prrtTimestamp_t, timestamp, ntohl);
     PrrtPacketField_decode(data_payload, dstBuffer, prrtTimedelta_t, groupRTprop_us, ntohl);
     PrrtPacketField_decode(data_payload, dstBuffer, prrtTimedelta_t, packetTimeout_us, ntohl);
-
-    prrtDeliveryRate_t *btlbw = (prrtDeliveryRate_t *) dstBuffer;
-    data_payload->btlbw = ntohl(*btlbw);
-    dstBuffer += sizeof(prrtDeliveryRate_t);
+    PrrtPacketField_decode(data_payload, dstBuffer, prrtDeliveryRate_t, btlbw, ntohl);
 
     return dstBuffer;
 }

prrt/proto/types/packet.h

@@ -67,7 +67,8 @@ typedef struct prrtPacketDataPayload {
         sizeof(prrtPacketLength_t) + \
         sizeof(prrtTimestamp_t) + \
         sizeof(prrtTimedelta_t) + \
-        sizeof(prrtTimestamp_t) )
+        sizeof(prrtTimestamp_t) + \
+        sizeof(prrtDeliveryRate_t))
 
 typedef struct prrtPacketRedundancyPayload {
     prrtSequenceNumber_t baseSequenceNumber;