fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-06 16:12:18 +00:00
Code Issues Projects Releases Wiki Activity

fix(kad): prevent simultaneous dials to peer

Browse Source 
By default, dialing is prevented when already connected. `kad` already checks this manually before doing dials. By changing the condition from `Disconnected` to `NotDialing`, we prevent simultaneous dials to a peer.

Pull-Request: #4224.
This commit is contained in:
Benno 2023-07-24 19:06:48 +02:00 committed by GitHub
parent 3f0fef2823
commit cf3cff147c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2813,7 +2813,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-kad" name = "libp2p-kad"
version = "0.44.2" version = "0.44.3"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"async-std", "async-std",

2
Cargo.toml
View File

@ -73,7 +73,7 @@ libp2p-floodsub = { version = "0.43.0", path = "protocols/floodsub" }
libp2p-gossipsub = { version = "0.45.0", path = "protocols/gossipsub" } libp2p-gossipsub = { version = "0.45.0", path = "protocols/gossipsub" }
libp2p-identify = { version = "0.43.0", path = "protocols/identify" } libp2p-identify = { version = "0.43.0", path = "protocols/identify" }
libp2p-identity = { version = "0.2.1" } libp2p-identity = { version = "0.2.1" }
libp2p-kad = { version = "0.44.2", path = "protocols/kad" } libp2p-kad = { version = "0.44.3", path = "protocols/kad" }
libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" } libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" }
libp2p-metrics = { version = "0.13.1", path = "misc/metrics" } libp2p-metrics = { version = "0.13.1", path = "misc/metrics" }
libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" } libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" }

7
protocols/kad/CHANGELOG.md
View File

@ -1,3 +1,10 @@
## 0.44.3 - unreleased
- Prevent simultaneous dials to peers.
See [PR 4224].
[PR 4224]: https://github.com/libp2p/rust-libp2p/pull/4224
## 0.44.2 ## 0.44.2
- Allow to explicitly set `Mode::{Client,Server}`. - Allow to explicitly set `Mode::{Client,Server}`.

2
protocols/kad/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "libp2p-kad"
edition = "2021" edition = "2021"
rust-version = "1.65.0" rust-version = "1.65.0"
description = "Kademlia protocol for libp2p" description = "Kademlia protocol for libp2p"
version = "0.44.2" version = "0.44.3"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT" license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p" repository = "https://github.com/libp2p/rust-libp2p"

9
protocols/kad/src/behaviour.rs
View File

@ -579,7 +579,9 @@ where
} }
kbucket::InsertResult::Pending { disconnected } => { kbucket::InsertResult::Pending { disconnected } => {
self.queued_events.push_back(ToSwarm::Dial { self.queued_events.push_back(ToSwarm::Dial {
opts: DialOpts::peer_id(disconnected.into_preimage()).build(), opts: DialOpts::peer_id(disconnected.into_preimage())
.condition(dial_opts::PeerCondition::NotDialing)
.build(),
}); });
RoutingUpdate::Pending RoutingUpdate::Pending
} }
@ -1306,6 +1308,7 @@ where
if !self.connected_peers.contains(disconnected.preimage()) { if !self.connected_peers.contains(disconnected.preimage()) {
self.queued_events.push_back(ToSwarm::Dial { self.queued_events.push_back(ToSwarm::Dial {
opts: DialOpts::peer_id(disconnected.into_preimage()) opts: DialOpts::peer_id(disconnected.into_preimage())
.condition(dial_opts::PeerCondition::NotDialing)
.build(), .build(),
}) })
} }
@ -2508,7 +2511,9 @@ where
} else if &peer_id != self.kbuckets.local_key().preimage() { } else if &peer_id != self.kbuckets.local_key().preimage() {
query.inner.pending_rpcs.push((peer_id, event)); query.inner.pending_rpcs.push((peer_id, event));
self.queued_events.push_back(ToSwarm::Dial { self.queued_events.push_back(ToSwarm::Dial {
opts: DialOpts::peer_id(peer_id).build(), opts: DialOpts::peer_id(peer_id)
.condition(dial_opts::PeerCondition::NotDialing)
.build(),
}); });
} }
} }