refactor(iroh): avoid storing the TransportsSender

Closes #3641

Author: dignifiedquire

iroh/src/magicsock.rs

@@ -850,7 +850,6 @@ impl Handle {
                 secret_key.public(),
                 metrics.magicsock.clone(),
                 direct_addrs.addrs.watch(),
-                transports.create_sender(),
                 discovery.clone(),
             )
         };

iroh/src/magicsock/remote_map.rs

@@ -18,7 +18,6 @@ use self::remote_state::{RemoteStateActor, RemoteStateHandle};
 use super::{
     DirectAddr, MagicsockMetrics,
     mapped_addrs::{AddrMap, EndpointIdMappedAddr, RelayMappedAddr},
-    transports::TransportsSender,
 };
 use crate::discovery::ConcurrentDiscovery;
 
@@ -58,7 +57,6 @@ pub(crate) struct RemoteMap {
     metrics: Arc<MagicsockMetrics>,
     /// The "direct" addresses known for our local endpoint
     local_direct_addrs: n0_watcher::Direct<BTreeSet<DirectAddr>>,
-    sender: TransportsSender,
     discovery: ConcurrentDiscovery,
 }
 
@@ -68,7 +66,6 @@ impl RemoteMap {
         local_endpoint_id: EndpointId,
         metrics: Arc<MagicsockMetrics>,
         local_direct_addrs: n0_watcher::Direct<BTreeSet<DirectAddr>>,
-        sender: TransportsSender,
         discovery: ConcurrentDiscovery,
     ) -> Self {
         Self {
@@ -78,7 +75,6 @@ impl RemoteMap {
             local_endpoint_id,
             metrics,
             local_direct_addrs,
-            sender,
             discovery,
         }
     }
@@ -137,7 +133,6 @@ impl RemoteMap {
             self.local_direct_addrs.clone(),
             self.relay_mapped_addrs.clone(),
             self.metrics.clone(),
-            self.sender.clone(),
             self.discovery.clone(),
         )
         .start();

iroh/src/magicsock/remote_map/remote_state.rs

@@ -140,7 +140,6 @@ pub(super) struct RemoteStateActor {
     //
     /// Metrics.
     metrics: Arc<MagicsockMetrics>,
-    sender: TransportsSender,
     /// Our local addresses.
     ///
     /// These are our local addresses and any reflexive transport addresses.
@@ -202,7 +201,6 @@ impl RemoteStateActor {
         local_direct_addrs: n0_watcher::Direct<BTreeSet<DirectAddr>>,
         relay_mapped_addrs: AddrMap<(RelayUrl, EndpointId), RelayMappedAddr>,
         metrics: Arc<MagicsockMetrics>,
-        sender: TransportsSender,
         discovery: ConcurrentDiscovery,
     ) -> Self {
         Self {
@@ -222,7 +220,6 @@ impl RemoteStateActor {
             scheduled_holepunch: None,
             scheduled_open_path: None,
             pending_open_paths: VecDeque::new(),
-            sender,
             discovery_stream: Either::Left(n0_future::stream::pending()),
         }
     }
@@ -342,8 +339,8 @@ impl RemoteStateActor {
     async fn handle_message(&mut self, msg: RemoteStateMessage) {
         // trace!("handling message");
         match msg {
-            RemoteStateMessage::SendDatagram(transmit) => {
-                self.handle_msg_send_datagram(transmit).await;
+            RemoteStateMessage::SendDatagram(sender, transmit) => {
+                self.handle_msg_send_datagram(sender, transmit).await;
             }
             RemoteStateMessage::AddConnection(handle, tx) => {
                 self.handle_msg_add_connection(handle, tx).await;
@@ -358,7 +355,11 @@ impl RemoteStateActor {
     }
 
     /// Handles [`RemoteStateMessage::SendDatagram`].
-    async fn handle_msg_send_datagram(&mut self, transmit: OwnedTransmit) {
+    async fn handle_msg_send_datagram(
+        &mut self,
+        mut sender: TransportsSender,
+        transmit: OwnedTransmit,
+    ) {
         // Sending datagrams might fail, e.g. because we don't have the right transports set
         // up to handle sending this owned transmit to.
         // After all, we try every single path that we know (relay URL, IP address), even
@@ -368,7 +369,7 @@ impl RemoteStateActor {
         if let Some(addr) = self.selected_path.get() {
             trace!(?addr, "sending datagram to selected path");
 
-            if let Err(err) = send_datagram(&mut self.sender, addr.clone(), transmit).await {
+            if let Err(err) = send_datagram(&mut sender, addr.clone(), transmit).await {
                 debug!(?addr, "failed to send datagram on selected_path: {err:#}");
             }
         } else {
@@ -392,7 +393,7 @@ impl RemoteStateActor {
                 {
                     trace!(%sockaddr, "not sending datagram to our own address");
                 } else if let Err(err) =
-                    send_datagram(&mut self.sender, addr.clone(), transmit.clone()).await
+                    send_datagram(&mut sender, addr.clone(), transmit.clone()).await
                 {
                     debug!(?addr, "failed to send datagram: {err:#}");
                 }
@@ -996,7 +997,7 @@ pub(crate) enum RemoteStateMessage {
     /// operation with a bunch more copying.  So it should only be used for sending QUIC
     /// Initial packets.
     #[debug("SendDatagram(..)")]
-    SendDatagram(OwnedTransmit),
+    SendDatagram(TransportsSender, OwnedTransmit),
     /// Adds an active connection to this remote endpoint.
     ///
     /// The connection will now be managed by this actor.  Holepunching will happen when

iroh/src/magicsock/transports.rs

@@ -693,7 +693,10 @@ impl quinn::UdpSender for MagicSender {
 
                 let sender = self.msock.remote_map.remote_state_actor(node_id);
                 let transmit = OwnedTransmit::from(quinn_transmit);
-                return match sender.try_send(RemoteStateMessage::SendDatagram(transmit)) {
+                return match sender.try_send(RemoteStateMessage::SendDatagram(
+                    self.sender.clone(),
+                    transmit,
+                )) {
                     Ok(()) => {
                         trace!(dst = ?mapped_addr, dst_node = %node_id.fmt_short(), "sent transmit");
                         Poll::Ready(Ok(()))