add more paths

Author: dignifiedquire

Cargo.lock

@@ -45,3 +45,12 @@ unused-async = "warn"
 [patch.crates-io]
 rustls = { git = "https://github.com/n0-computer/rustls", rev = "be02113e7837df60953d02c2bdd0f4634fef3a80" }
 netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "feat-multipath" }
+
+[patch."https://github.com/n0-computer/quinn"]
+# iroh-quinn = { path = "../iroh-quinn/quinn" }
+# iroh-quinn-proto = { path = "../iroh-quinn/quinn-proto" }
+# iroh-quinn-udp = { path = "../iroh-quinn/quinn-udp" }
+
+iroh-quinn = { git = "https://github.com//n0-computer/quinn", branch = "multipath-misc" }
+iroh-quinn-proto = { git = "https://github.com//n0-computer/quinn", branch = "multipath-misc" }
+iroh-quinn-udp = { git = "https://github.com//n0-computer/quinn", branch = "multipath-misc" }

Cargo.toml

@@ -769,15 +769,13 @@ impl Endpoint {
             client_config
         };
 
+        // TODO: race available addresses, this is currently only using the relay addr to connect
+        let dest_addr = mapped_addr.private_socket_addr();
         let server_name = &tls::name::encode(node_id);
         let connect = self
             .msock
             .endpoint()
-            .connect_with(
-                client_config,
-                mapped_addr.private_socket_addr(),
-                server_name,
-            )
+            .connect_with(client_config, dest_addr, server_name)
             .context(QuinnSnafu)?;
 
         Ok(Connecting {

iroh/src/endpoint.rs

@@ -425,39 +425,7 @@ impl MagicSock {
                 .add_node_addr(addr.clone(), source, &self.metrics.magicsock);
 
             // Add paths to the existing connections
-            {
-                let mut map = self.connection_map.map.lock().expect("poisoned");
-                let mut to_delete = Vec::new();
-                if let Some(conns) = map.get_mut(&addr.node_id) {
-                    for (i, conn) in conns.into_iter().enumerate() {
-                        if let Some(conn) = conn.upgrade() {
-                            for addr in addr.direct_addresses() {
-                                let conn = conn.clone();
-                                let addr = *addr;
-                                task::spawn(async move {
-                                    if let Err(err) = conn
-                                        .open_path(addr, quinn_proto::PathStatus::Available)
-                                        .await
-                                    {
-                                        warn!("failed to open path {:?}", err);
-                                    }
-                                });
-                            }
-                            // TODO: add relay path as mapped addr
-                        } else {
-                            to_delete.push(i);
-                        }
-                    }
-                    // cleanup dead connections
-                    let mut i = 0;
-                    conns.retain(|_| {
-                        let remove = to_delete.contains(&i);
-                        i += 1;
-
-                        !remove
-                    });
-                }
-            }
+            self.add_paths(addr);
 
             Ok(())
         } else if pruned != 0 {
@@ -467,6 +435,41 @@ impl MagicSock {
         }
     }
 
+    /// Adds all available addresses in the given `addr` as paths
+    fn add_paths(&self, addr: NodeAddr) {
+        let mut map = self.connection_map.map.lock().expect("poisoned");
+        let mut to_delete = Vec::new();
+        if let Some(conns) = map.get_mut(&addr.node_id) {
+            for (i, conn) in conns.into_iter().enumerate() {
+                if let Some(conn) = conn.upgrade() {
+                    for addr in addr.direct_addresses() {
+                        let conn = conn.clone();
+                        let addr = *addr;
+                        task::spawn(async move {
+                            if let Err(err) = conn
+                                .open_path(addr, quinn_proto::PathStatus::Available)
+                                .await
+                            {
+                                warn!("failed to open path {:?}", err);
+                            }
+                        });
+                    }
+                    // TODO: add relay path as mapped addr
+                } else {
+                    to_delete.push(i);
+                }
+            }
+            // cleanup dead connections
+            let mut i = 0;
+            conns.retain(|_| {
+                let remove = to_delete.contains(&i);
+                i += 1;
+
+                !remove
+            });
+        }
+    }
+
     /// Stores a new set of direct addresses.
     ///
     /// If the direct addresses have changed from the previous set, they are published to
@@ -877,9 +880,18 @@ impl MagicSock {
                         return;
                     }
                 }
+
+                // Add new addresses as paths
+                self.add_paths(NodeAddr {
+                    node_id: sender,
+                    relay_url: None,
+                    direct_addresses: cm.my_numbers.iter().copied().collect(),
+                });
+
                 let ping_actions =
                     self.node_map
                         .handle_call_me_maybe(sender, cm, &self.metrics.magicsock);
+
                 for action in ping_actions {
                     match action {
                         PingAction::SendCallMeMaybe { .. } => {