leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make questionable node pings better

Browse source
This commit is contained in:
Igor Katson 2023-11-30 09:38:35 +00:00
parent 210a3d5d3e
commit f04277cc11
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 65 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/dht/src/routing_table.rs
View file

@ -287,7 +287,7 @@ impl BucketTree {
self_id: &Id20,
id: Id20,
addr: SocketAddr,
on_questionable_node: impl FnMut(SocketAddr) -> bool,
on_questionable_node: impl FnMut(Id20, SocketAddr) -> bool,
) -> InsertResult {
let idx = self.get_leaf(&id);
self.insert_into_leaf(idx, self_id, id, addr, on_questionable_node)
@ -298,7 +298,7 @@ impl BucketTree {
self_id: &Id20,
id: Id20,
addr: SocketAddr,
mut on_questionable_node: impl FnMut(SocketAddr) -> bool,
mut on_questionable_node: impl FnMut(Id20, SocketAddr) -> bool,
) -> InsertResult {
// The loop here is for this case:
// in case we split a node into two, and it degenerates into all the leaves
@ -337,7 +337,7 @@ impl BucketTree {
.iter_mut()
.find(|r| matches!(r.status(), NodeStatus::Questionable))
{
if on_questionable_node(questionable_node.addr) {
if on_questionable_node(questionable_node.id, questionable_node.addr) {
questionable_node.mark_outgoing_request();
}
}
@ -545,7 +545,7 @@ impl RoutingTable {
&mut self,
id: Id20,
addr: SocketAddr,
on_questionable_node: impl FnMut(SocketAddr) -> bool,
on_questionable_node: impl FnMut(Id20, SocketAddr) -> bool,
) -> InsertResult {
let res = self
.buckets
@ -690,7 +690,7 @@ mod tests {
for _ in 0..length.unwrap_or(16536) {
let other_id = random_id_20();
let addr = generate_socket_addr();
rtable.add_node(other_id, addr, |_| false);
rtable.add_node(other_id, addr, |_, _| false);
}
rtable
}