Merge fa1fa7b into 36842d5

Author: matheus23

iroh/src/magicsock.rs

@@ -1879,8 +1879,13 @@ impl Actor {
                         continue;
                     };
                     let is_major = state.is_major_change(&current_netmon_state);
+                    event!(
+                        target: "iroh::_events::link_change",
+                        Level::DEBUG,
+                        ?state,
+                        is_major
+                    );
                     current_netmon_state = state;
-                    trace!("tick: link change {}", is_major);
                     self.msock.metrics.magicsock.actor_link_change.inc();
                     self.handle_network_change(is_major).await;
                 }
@@ -1912,11 +1917,11 @@ impl Actor {
     }
 
     async fn handle_network_change(&mut self, is_major: bool) {
-        debug!("link change detected: major? {}", is_major);
+        debug!(is_major, "link change detected");
 
         if is_major {
             if let Err(err) = self.network_change_sender.rebind() {
-                warn!("failed to rebind transports: {:?}", err);
+                warn!("failed to rebind transports: {err:?}");
             }
 
             #[cfg(not(wasm_browser))]

iroh/src/magicsock/node_map/node_state.rs

@@ -294,22 +294,22 @@ impl NodeState {
         let (best_addr, relay_url) = match self.udp_paths.send_addr(have_ipv6) {
             UdpSendAddr::Valid(addr) => {
                 // If we have a valid address we use it.
-                trace!(%addr, "UdpSendAddr is valid, use it");
+                trace!(%addr, ?have_ipv6, "UdpSendAddr is valid, use it");
                 (Some(*addr), None)
             }
             UdpSendAddr::Outdated(addr) => {
                 // If the address is outdated we use it, but send via relay at the same time.
                 // We also send disco pings so that it will become valid again if it still
                 // works (i.e. we don't need to holepunch again).
-                trace!(%addr, "UdpSendAddr is outdated, use it together with relay");
+                trace!(%addr, ?have_ipv6, "UdpSendAddr is outdated, use it together with relay");
                 (Some(*addr), self.relay_url())
             }
             UdpSendAddr::Unconfirmed(addr) => {
-                trace!(%addr, "UdpSendAddr is unconfirmed, use it together with relay");
+                trace!(%addr, ?have_ipv6, "UdpSendAddr is unconfirmed, use it together with relay");
                 (Some(*addr), self.relay_url())
             }
             UdpSendAddr::None => {
-                trace!("No UdpSendAddr, use relay");
+                trace!(?have_ipv6, "No UdpSendAddr, use relay");
                 (None, self.relay_url())
             }
         };

iroh/src/magicsock/node_map/udp_paths.rs

@@ -132,6 +132,11 @@ impl NodeUdpPaths {
     /// Returns the current UDP address to send on.
     pub(super) fn send_addr(&self, have_ipv6: bool) -> &UdpSendAddr {
         if !have_ipv6 {
+            // If it's a valid address, it doesn't matter if our interface scan determined that we
+            // "probably" don't have IPv6, because we clearly were able to send and receive a ping/pong over IPv6.
+            if matches!(&self.best, UdpSendAddr::Valid(_)) {
+                return &self.best;
+            }
             return &self.best_ipv4;
         }
         &self.best