Merge branch 'main' into matheus23/no-warn-progress

n0-computer · Sep 2, 2024 · 833e3ad · 833e3ad
2 parents 8a913cf + fd56763
commit 833e3ad
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/iroh-blobs/src/downloader.rs b/iroh-blobs/src/downloader.rs
@@ -411,7 +411,7 @@ impl Downloader {
         }
     }
 
-    /// Declare that certains nodes can be used to download a hash.
+    /// Declare that certain nodes can be used to download a hash.
     ///
     /// Note that this does not start a download, but only provides new nodes to already queued
     /// downloads. Use [`Self::queue`] to queue a download.

diff --git a/iroh-net/src/discovery/local_swarm_discovery.rs b/iroh-net/src/discovery/local_swarm_discovery.rs
@@ -121,19 +121,28 @@ impl LocalSwarmDiscovery {
                             continue;
                         }
 
-                        if let Some(senders) = senders.get(&discovered_node_id) {
-                            for sender in senders.values() {
-                                let item: DiscoveryItem = (&peer_info).into();
-                                trace!(?item, "sending DiscoveryItem");
-                                sender.send(Ok(item)).await.ok();
+                        let entry = node_addrs.entry(discovered_node_id);
+                        if let std::collections::hash_map::Entry::Occupied(ref entry) = entry {
+                            if entry.get() == &peer_info {
+                                // this is a republish we already know about
+                                continue;
                             }
                         }
+
                         debug!(
                             ?discovered_node_id,
                             ?peer_info,
                             "adding node to LocalSwarmDiscovery address book"
                         );
-                        node_addrs.insert(discovered_node_id, peer_info);
+
+                        if let Some(senders) = senders.get(&discovered_node_id) {
+                            let item: DiscoveryItem = (&peer_info).into();
+                            trace!(?item, senders = senders.len(), "sending DiscoveryItem");
+                            for sender in senders.values() {
+                                sender.send(Ok(item.clone())).await.ok();
+                            }
+                        }
+                        entry.or_insert(peer_info);
                     }
                     Message::SendAddrs(node_id, sender) => {
                         let id = last_id + 1;