satman: support sub-subkernels, routing

src/satman/src/main.rs

@@ -239,10 +239,10 @@ fn process_aux_packet(
         drtioaux::Packet::RoutingSetRank { rank: _ } => drtioaux::send(0, &drtioaux::Packet::RoutingAck),
 
         drtioaux::Packet::RoutingRetrievePackets => {
-            let packet = match router.get_upstream_packet() {
+            let packet = router
-                Some(packet) => packet,
+                .get_upstream_packet()
-                None => drtioaux::Packet::RoutingNoPackets,
+                .or(Some(drtioaux::Packet::RoutingNoPackets))
-            };
+                .unwrap();
             drtioaux::send(0, &packet)
         }
 
@@ -614,10 +614,12 @@ fn process_aux_packet(
         } => {
             forward!(_routing_table, _destination, *rank, _repeaters, &packet, timer);
             kernel_manager.message_handle_incoming(status, length as usize, &data);
-            router.send(drtioaux::Packet::SubkernelMessageAck { destination: source },
+            router.send(
-                        _routing_table,
+                drtioaux::Packet::SubkernelMessageAck { destination: source },
-                        *rank,
+                _routing_table,
-                        *self_destination)
+                *rank,
+                *self_destination,
+            )
         }
         drtioaux::Packet::SubkernelMessageAck {
             destination: _destination,