Skip to content

Restore removal of old addresses #2244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Restore removal of old addresses #2244

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1be6fac
Restore removal of old addresses
nazar-pc Nov 18, 2023
185767c
Fix removal of addresses from Kademlia to account for identity in mul…
nazar-pc Nov 18, 2023
1e478b2
Filter private addresses early to do less work overall
nazar-pc Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 58 additions & 40 deletions crates/subspace-networking/src/node_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,48 +733,55 @@ where
});

if full_kademlia_support {
//TODO: Consider restoring obsolete address removal
// let old_addresses = kademlia
// .kbucket(peer_id)
// .and_then(|peers| {
// let key = peer_id.into();
// peers.iter().find_map(|peer| {
// (peer.node.key == &key).then_some(
// peer.node
// .value
// .iter()
// .filter(|address| info.listen_addrs.contains(address))
// .cloned()
// .collect::<Vec<_>>(),
// )
// })
// })
// .unwrap_or_default();

// for old_address in old_addresses {
// trace!(
// %local_peer_id,
// %peer_id,
// %old_address,
// "Removing old self-reported address from Kademlia DHT",
// );
//
// kademlia.remove_address(&peer_id, &old_address);
// }
let received_addresses = info
.listen_addrs
.into_iter()
.filter(|address| {
if self.allow_non_global_addresses_in_dht
|| is_global_address_or_dns(address)
{
true
} else {
trace!(
%local_peer_id,
%peer_id,
%address,
"Ignoring self-reported non-global address",
);

for address in info.listen_addrs {
if !self.allow_non_global_addresses_in_dht
&& !is_global_address_or_dns(&address)
{
trace!(
%local_peer_id,
%peer_id,
%address,
"Ignoring self-reported non-global address",
);
continue;
}
false
}
})
.collect::<Vec<_>>();
let received_address_strings = received_addresses
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>();
let old_addresses = kademlia
.kbucket(peer_id)
.and_then(|peers| {
let key = peer_id.into();
peers.iter().find_map(|peer| {
(peer.node.key == &key).then_some(
peer.node
.value
.iter()
.filter(|existing_address| {
let existing_address = existing_address.to_string();

!received_address_strings.iter().any(|received_address| {
received_address.starts_with(&existing_address)
|| existing_address.starts_with(received_address)
})
})
.cloned()
.collect::<Vec<_>>(),
)
})
})
.unwrap_or_default();

for address in received_addresses {
debug!(
%local_peer_id,
%peer_id,
Expand All @@ -785,6 +792,17 @@ where

kademlia.add_address(&peer_id, address);
}

for old_address in old_addresses {
trace!(
%local_peer_id,
%peer_id,
%old_address,
"Removing old self-reported address from Kademlia DHT",
);

kademlia.remove_address(&peer_id, &old_address);
}
} else {
debug!(
%local_peer_id,
Expand Down