Merge remote-tracking branch 'origin/feat-multipath' into Frando/qlog-latest

Author: Frando

Cargo.lock

@@ -47,8 +47,7 @@ iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "Frando/ql
 iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
 iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
 
-netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "Frando/quinn-qlog" }
-portmapper = { git = "https://github.com/n0-computer/net-tools", branch = "Frando/quinn-qlog" }
+netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "main" }
 
 # iroh-quinn = { path = "../quinn/quinn" }
 # iroh-quinn-proto = { path = "../quinn/quinn-proto" }

Cargo.toml

@@ -146,12 +146,14 @@ wasm-bindgen-test = "0.3"
 cfg_aliases = { version = "0.2.1" }
 
 [features]
-default = ["metrics"]
+default = ["metrics", "fast-apple-datapath"]
 metrics = ["iroh-metrics/metrics", "iroh-relay/metrics", "portmapper/metrics"]
 test-utils = ["iroh-relay/test-utils", "iroh-relay/server", "dep:axum"]
 discovery-local-network = ["dep:swarm-discovery"]
 discovery-pkarr-dht = ["pkarr/dht"]
 qlog = ["quinn/qlog"]
+# Use private Apple APIs to send multiple packets in a single syscall.
+fast-apple-datapath = ["quinn/fast-apple-datapath"]
 
 [package.metadata.docs.rs]
 all-features = true

iroh/Cargo.toml

@@ -28,6 +28,8 @@ tracing-subscriber = { version = "0.3.0", default-features = false, features = [
 ] }
 
 [features]
-default = ["metrics"]
+default = ["metrics", "fast-apple-datapath"]
 metrics = ["iroh/metrics", "iroh-metrics"]
 local-relay = ["iroh/test-utils"]
+# Use private Apple APIs to send multiple packets in a single syscall.
+fast-apple-datapath = ["iroh/fast-apple-datapath", "quinn/fast-apple-datapath"]

iroh/bench/Cargo.toml

@@ -185,11 +185,6 @@ pub enum Source {
         _0: Private,
     },
     /// We established a connection on this address.
-    ///
-    /// Currently this means the path was in uses as [`PathId::ZERO`] when the a connection
-    /// was added to the `RemoteStateActor`.
-    ///
-    /// [`PathId::ZERO`]: quinn_proto::PathId::ZERO
     #[strum(serialize = "Connection")]
     Connection {
         /// private marker

iroh/src/magicsock/remote_map.rs

@@ -50,16 +50,6 @@ const HOLEPUNCH_ATTEMPTS_INTERVAL: Duration = Duration::from_secs(5);
 mod guarded_channel;
 mod path_state;
 
-// TODO: use this
-// /// Number of addresses that are not active that we keep around per endpoint.
-// ///
-// /// See [`RemoteState::prune_direct_addresses`].
-// pub(super) const MAX_INACTIVE_DIRECT_ADDRESSES: usize = 20;
-
-// TODO: use this
-// /// How long since an endpoint path was last alive before it might be pruned.
-// const LAST_ALIVE_PRUNE_DURATION: Duration = Duration::from_secs(120);
-
 // TODO: use this
 // /// The latency at or under which we don't try to upgrade to a better path.
 // const GOOD_ENOUGH_LATENCY: Duration = Duration::from_millis(5);
@@ -461,7 +451,7 @@ impl RemoteStateActor {
                 path.set_status(status).ok();
                 conn_state.add_open_path(path_remote.clone(), PathId::ZERO);
                 self.paths
-                    .insert(path_remote, Source::Connection { _0: Private });
+                    .insert_open_path(path_remote.clone(), Source::Connection { _0: Private });
                 self.select_path();
 
                 if path_remote_is_ip {
@@ -779,15 +769,17 @@ impl RemoteStateActor {
                     );
                     conn_state.add_open_path(path_remote.clone(), path_id);
                     self.paths
-                        .insert(path_remote, Source::Connection { _0: Private });
+                        .insert_open_path(path_remote.clone(), Source::Connection { _0: Private });
                 }
 
                 self.select_path();
             }
             PathEvent::Abandoned { id, path_stats } => {
                 trace!(?path_stats, "path abandoned");
                 // This is the last event for this path.
-                conn_state.remove_path(&id);
+                if let Some(addr) = conn_state.remove_path(&id) {
+                    self.paths.abandoned_path(&addr);
+                }
             }
             PathEvent::Closed { id, .. } | PathEvent::LocallyClosed { id, .. } => {
                 let Some(path_remote) = conn_state.paths.get(&id).cloned() else {
@@ -1073,11 +1065,13 @@ impl ConnectionState {
     }
 
     /// Completely removes a path from this connection.
-    fn remove_path(&mut self, path_id: &PathId) {
-        if let Some(addr) = self.paths.remove(path_id) {
-            self.path_ids.remove(&addr);
+    fn remove_path(&mut self, path_id: &PathId) -> Option<transports::Addr> {
+        let addr = self.paths.remove(path_id);
+        if let Some(ref addr) = addr {
+            self.path_ids.remove(addr);
         }
         self.open_paths.remove(path_id);
+        addr
     }
 
     /// Removes the path from the open paths.