linux-specific fixes to IpPacketRouter

Author: jstuczyn

common/wireguard-private-metadata/server/src/http/mod.rs

@@ -1,12 +1,9 @@
 // Copyright 2025 - Nym Technologies SA <[email protected]>
 // SPDX-License-Identifier: Apache-2.0
 
+use nym_wireguard::WgApiWrapper;
 use std::sync::Arc;
-
 use tokio::task::JoinHandle;
-use tokio_util::sync::CancellationToken;
-
-use nym_wireguard::WgApiWrapper;
 
 pub(crate) mod openapi;
 pub(crate) mod router;
@@ -20,7 +17,6 @@ pub(crate) mod state;
 /// AFTER you have shut down BG tasks (or past their grace period).
 #[allow(unused)]
 pub struct ShutdownHandles {
-    axum_shutdown_button: CancellationToken,
     /// Tokio JoinHandle for axum server's task
     axum_join_handle: AxumJoinHandle,
     /// Wireguard API for kernel interactions
@@ -30,13 +26,8 @@ pub struct ShutdownHandles {
 impl ShutdownHandles {
     /// Cancellation token is given to Axum server constructor. When the token
     /// receives a shutdown signal, Axum server will shut down gracefully.
-    pub fn new(
-        axum_join_handle: AxumJoinHandle,
-        wg_api: Arc<WgApiWrapper>,
-        axum_shutdown_button: CancellationToken,
-    ) -> Self {
+    pub fn new(axum_join_handle: AxumJoinHandle, wg_api: Arc<WgApiWrapper>) -> Self {
         Self {
-            axum_shutdown_button,
             axum_join_handle,
             wg_api,
         }

gateway/src/node/mod.rs

@@ -508,13 +508,13 @@ impl GatewayTasksBuilder {
             ecash_manager,
             self.metrics.clone(),
             all_peers,
-            self.shutdown_tracker.clone(),
+            self.shutdown_tracker.clone_shutdown_token(),
             wireguard_data,
         )
         .await?;
 
         let server = router.build_server(&bind_address).await?;
-        let cancel_token = self.shutdown_tracker.clone();
+        let cancel_token = self.shutdown_tracker.clone_shutdown_token();
         let server_handle = tokio::spawn(async move {
             {
                 info!("Started Wireguard Axum HTTP V2 server on {bind_address}");
@@ -524,11 +524,8 @@ impl GatewayTasksBuilder {
             }
         });
 
-        let shutdown_handles = nym_wireguard_private_metadata_server::ShutdownHandles::new(
-            server_handle,
-            wg_handle,
-            cancel_token,
-        );
+        let shutdown_handles =
+            nym_wireguard_private_metadata_server::ShutdownHandles::new(server_handle, wg_handle);
 
         Ok(shutdown_handles)
     }

service-providers/ip-packet-router/src/cli/run.rs

@@ -28,7 +28,7 @@ pub(crate) async fn execute(args: &Run) -> Result<(), IpPacketRouterError> {
     log::debug!("Using config: {config:#?}");
 
     log::info!("Starting ip packet router service provider");
-    let mut shutdown_manager = ShutdownManager::build_new_default?;
+    let mut shutdown_manager = ShutdownManager::build_new_default()?;
     let mut server = nym_ip_packet_router::IpPacketRouter::new(
         config,
         shutdown_manager.shutdown_tracker_owned(),

service-providers/ip-packet-router/src/ip_packet_router.rs

@@ -155,7 +155,7 @@ impl IpPacketRouter {
 
         let tun_listener = TunListener {
             tun_reader,
-            task_client: task_handle.get_handle(),
+            shutdown_token: self.shutdown.clone_shutdown_token(),
             connected_clients: connected_clients_rx,
         };
         tun_listener.start();
@@ -168,7 +168,7 @@ impl IpPacketRouter {
             request_filter: request_filter.clone(),
             tun_writer,
             mixnet_client,
-            shutdown_token: task_handle,
+            shutdown_token: self.shutdown.clone_shutdown_token(),
             connected_clients,
         };
 

service-providers/ip-packet-router/src/tun_listener.rs

@@ -4,14 +4,14 @@
 use std::collections::HashMap;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
+use crate::clients::{ConnectEvent, ConnectedClientEvent, DisconnectEvent};
+use crate::{error::Result, util::parse_ip::parse_dst_addr};
 use nym_ip_packet_requests::IpPair;
+use nym_task::ShutdownToken;
 #[cfg(target_os = "linux")]
 use tokio::io::AsyncReadExt;
 use tokio::sync::mpsc;
 
-use crate::clients::{ConnectEvent, ConnectedClientEvent, DisconnectEvent};
-use crate::{error::Result, util::parse_ip::parse_dst_addr};
-
 // The TUN listener keeps a local map of the connected clients that has its state updated by the
 // mixnet listener. Basically it's just so that we don't have to have mutexes around shared state.
 // It's even ok if this is slightly out of date
@@ -78,7 +78,7 @@ impl ConnectedClientsListener {
 #[cfg(target_os = "linux")]
 pub(crate) struct TunListener {
     pub(crate) tun_reader: tokio::io::ReadHalf<tokio_tun::Tun>,
-    pub(crate) task_client: TaskClient,
+    pub(crate) shutdown_token: ShutdownToken,
     pub(crate) connected_clients: ConnectedClientsListener,
 }