Merge remote-tracking branch 'origin/feat-multipath' into Frando/mp-f…

…ix-remote-state-actor-loop

iroh/src/magicsock/remote_map/remote_state.rs

@@ -375,9 +375,17 @@ impl RemoteStateActor {
             if self.paths.is_empty() {
                 warn!("Cannot send datagrams: No paths to remote endpoint known");
             }
-            for addr in self.paths.keys() {
-                if let Err(err) = self.send_datagram(addr.clone(), transmit.clone()).await {
-                    debug!(?addr, "failed to send datagram: {err:#}");
+            for addr in self.paths.addrs() {
+                // We never want to send to our local addresses.
+                // The local address set is updated in the main loop so we can use `peek` here.
+                if let transports::Addr::Ip(sockaddr) = addr
+                    && self.local_addrs.peek().iter().any(|a| a.addr == *sockaddr)
+                {
+                    trace!(%sockaddr, "not sending datagram to our own address");
+                } else {
+                    if let Err(err) = self.send_datagram(addr.clone(), transmit.clone()).await {
+                        debug!(?addr, "failed to send datagram: {err:#}");
+                    }
                 }
             }
             // This message is received *before* a connection is added.  So we do

iroh/src/magicsock/remote_map/remote_state/path_state.rs

@@ -117,6 +117,11 @@ impl RemotePathState {
         self.paths.keys()
     }
 
+    /// Returns whether this stores any addresses.
+    pub(super) fn is_empty(&self) -> bool {
+        self.paths.is_empty()
+    }
+
     /// Replies to all pending resolve requests.
     ///
     /// This is a no-op if no requests are queued. Replies `Ok` if we have any known paths,