fix

Author: pavel-kirienko

libudpard/udpard.c

@@ -1676,11 +1676,11 @@ static void rx_port_accept_stateful(udpard_rx_t* const         rx,
         .now                   = timestamp,
     };
     rx_session_t* const ses = // Will find an existing one or create a new one.
-      (rx_session_t*)cavl2_find_or_insert(&port->index_session_by_remote_uid,
-                                          &frame.meta.sender_uid,
-                                          &cavl_compare_rx_session_by_remote_uid,
-                                          &fac_args,
-                                          &cavl_factory_rx_session_by_remote_uid);
+      (rx_session_t*)(void*)cavl2_find_or_insert(&port->index_session_by_remote_uid,
+                                                 &frame.meta.sender_uid,
+                                                 &cavl_compare_rx_session_by_remote_uid,
+                                                 &fac_args,
+                                                 &cavl_factory_rx_session_by_remote_uid);
     if (ses != NULL) {
         rx_session_update(ses, rx, timestamp, source_ep, frame, payload_deleter, redundant_iface_index);
     } else {

libudpard/udpard.h

@@ -707,7 +707,7 @@ typedef struct udpard_rx_t
 
     uint64_t errors_oom;                ///< A frame could not be processed (transfer possibly dropped) due to OOM.
     uint64_t errors_frame_malformed;    ///< A received frame was malformed and thus dropped.
-    uint64_t errors_transfer_malformed; ///< A received transfer was malformed (e.g., CRC error) and thus dropped.
+    uint64_t errors_transfer_malformed; ///< A transfer could not be reassembled correctly.
 
     void* user; ///< Opaque pointer for the application use only. Not accessed by the library.
 } udpard_rx_t;

tests/src/test_public.cpp

@@ -166,11 +166,11 @@ void test_udpard_fragment_gather()
     const udpard_mem_deleter_t  del_payload = instrumented_allocator_make_deleter(&alloc_payload);
 
     // Test 1: NULL fragment returns 0.
-    char buf[100];  // NOLINT(*-avoid-c-arrays)
+    char buf[100]; // NOLINT(*-avoid-c-arrays)
     TEST_ASSERT_EQUAL_size_t(0, udpard_fragment_gather(nullptr, sizeof(buf), static_cast<void*>(buf)));
 
     // Test 2: NULL destination returns 0.
-    udpard_fragment_t* single = make_test_fragment(mem_frag, mem_payload, del_payload, 0, 5, "hello");
+    udpard_fragment_t* const single = make_test_fragment(mem_frag, mem_payload, del_payload, 0, 5, "hello");
     TEST_ASSERT_NOT_NULL(single);
     single->index_offset.up    = nullptr;
     single->index_offset.lr[0] = nullptr;
@@ -179,12 +179,12 @@ void test_udpard_fragment_gather()
     TEST_ASSERT_EQUAL_size_t(0, udpard_fragment_gather(single, sizeof(buf), nullptr));
 
     // Test 3: Single fragment - gather all.
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(5, udpard_fragment_gather(single, sizeof(buf), static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("hello", buf, 5);
 
     // Test 4: Single fragment - truncation (destination smaller than fragment).
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(3, udpard_fragment_gather(single, 3, static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("hel", buf, 3);
 
@@ -193,11 +193,11 @@ void test_udpard_fragment_gather()
     mem_frag.free(mem_frag.user, sizeof(udpard_fragment_t), single);
 
     // Test 5: Multiple fragments forming a tree.
-    // Create tree: root at offset 5 ("MID"), left at offset 0 ("ABCDE"), right at offset 10 ("WXYZ")
+    // Create tree: root at offset 5 ("MID"), left at offset 0 ("ABCDE"), right at offset 8 ("WXYZ")
     // Total payload when gathered: "ABCDE" + "MID" + "WXYZ" = "ABCDEMIDWXYZ" (12 bytes)
-    udpard_fragment_t* root  = make_test_fragment(mem_frag, mem_payload, del_payload, 5, 3, "MID");
-    udpard_fragment_t* left  = make_test_fragment(mem_frag, mem_payload, del_payload, 0, 5, "ABCDE");
-    udpard_fragment_t* right = make_test_fragment(mem_frag, mem_payload, del_payload, 10, 4, "WXYZ");
+    udpard_fragment_t* const root  = make_test_fragment(mem_frag, mem_payload, del_payload, 5, 3, "MID");
+    udpard_fragment_t* const left  = make_test_fragment(mem_frag, mem_payload, del_payload, 0, 5, "ABCDE");
+    udpard_fragment_t* const right = make_test_fragment(mem_frag, mem_payload, del_payload, 8, 4, "WXYZ");
     TEST_ASSERT_NOT_NULL(root);
     TEST_ASSERT_NOT_NULL(left);
     TEST_ASSERT_NOT_NULL(right);
@@ -219,27 +219,27 @@ void test_udpard_fragment_gather()
     right->index_offset.bf    = 0;
 
     // Gather from root - should collect all fragments in order.
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(12, udpard_fragment_gather(root, sizeof(buf), static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("ABCDEMIDWXYZ", buf, 12);
 
     // Gather from left child - should still collect all fragments (traverses to root first).
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(12, udpard_fragment_gather(left, sizeof(buf), static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("ABCDEMIDWXYZ", buf, 12);
 
     // Gather from right child - should still collect all fragments.
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(12, udpard_fragment_gather(right, sizeof(buf), static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("ABCDEMIDWXYZ", buf, 12);
 
     // Test 6: Truncation with multiple fragments - buffer smaller than total.
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(7, udpard_fragment_gather(root, 7, static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("ABCDEMI", buf, 7);
 
     // Test 7: Truncation mid-fragment.
-    (void) std::memset(static_cast<void*>(buf), 0, sizeof(buf));
+    (void)std::memset(static_cast<void*>(buf), 0, sizeof(buf));
     TEST_ASSERT_EQUAL_size_t(3, udpard_fragment_gather(root, 3, static_cast<void*>(buf)));
     TEST_ASSERT_EQUAL_MEMORY("ABC", buf, 3);