remove unnecessary reordering key

Author: pavel-kirienko

libudpard/udpard.c

@@ -1868,22 +1868,14 @@ static int32_t cavl_compare_rx_session_by_remote_uid(const void* const user, con
     return 0; // clang-format on
 }
 
-// Key for reordering deadline ordering with stable tiebreaking.
-typedef struct
-{
-    udpard_us_t deadline;
-    uint64_t    remote_uid;
-} rx_reordering_key_t;
-
-// Compare sessions by reordering deadline then by remote UID.
 static int32_t cavl_compare_rx_session_by_reordering_deadline(const void* const user, const udpard_tree_t* const node)
 {
-    const rx_reordering_key_t* const key = (const rx_reordering_key_t*)user;
-    const rx_session_t* const ses = CAVL2_TO_OWNER(node, rx_session_t, index_reordering_window); // clang-format off
-    if (key->deadline  < ses->reordering_window_deadline) { return -1; }
-    if (key->deadline  > ses->reordering_window_deadline) { return +1; }
-    if (key->remote_uid < ses->remote.uid)                { return -1; }
-    if (key->remote_uid > ses->remote.uid)                { return +1; }
+    const rx_session_t* const outer = (const rx_session_t*)user;
+    const rx_session_t* const inner = CAVL2_TO_OWNER(node, rx_session_t, index_reordering_window); // clang-format off
+    if (outer->reordering_window_deadline < inner->reordering_window_deadline) { return -1; }
+    if (outer->reordering_window_deadline > inner->reordering_window_deadline) { return +1; }
+    if (outer->remote.uid < inner->remote.uid) { return -1; }
+    if (outer->remote.uid > inner->remote.uid) { return +1; }
     return 0; // clang-format on
 }
 
@@ -2001,11 +1993,8 @@ static void rx_session_ordered_scan_slots(rx_session_t* const self,
             // closure deadline, but we ignore them because the nearest transfer overrides the more distant ones.
             if (slot != NULL) {
                 self->reordering_window_deadline = slot->ts_min + self->port->reordering_window;
-                // Insert into reordering index with deterministic tie-breaking.
-                const rx_reordering_key_t key = { .deadline   = self->reordering_window_deadline,
-                                                  .remote_uid = self->remote.uid };
                 const udpard_tree_t* res = cavl2_find_or_insert(&rx->index_session_by_reordering, //----------------
-                                                                &key,
+                                                                self,
                                                                 &cavl_compare_rx_session_by_reordering_deadline,
                                                                 &self->index_reordering_window,
                                                                 &cavl2_trivial_factory);