fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-25 07:41:34 +00:00
Code Issues Projects Releases Wiki Activity

Swarm::dial adds addresses when pending (#919)

Browse Source 
* Swarm::dial adds addresses when pending

* Bump libp2p-core to 0.3.3
This commit is contained in:
Pierre Krieger
2019-02-05 17:29:30 +01:00
committed by GitHub
parent 479924f8dc
commit 909f50f989
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "libp2p-core" name = "libp2p-core"
edition = "2018" edition = "2018"
description = "Core traits and structs of libp2p" description = "Core traits and structs of libp2p"
version = "0.3.2" version = "0.3.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
core/src/nodes/raw_swarm.rs
View File

@ -1613,6 +1613,15 @@ where
self.attempt.get().next_attempts.iter() self.attempt.get().next_attempts.iter()
} }
/// Adds new multiaddrs to attempt if the current dialing fails.
///
/// Doesn't do anything for multiaddresses that are already in the queue.
pub fn append_multiaddr_attempts(&mut self, addrs: impl IntoIterator<Item = Multiaddr>) {
for addr in addrs {
self.append_multiaddr_attempt(addr);
}
}
/// Adds a new multiaddr to attempt if the current dialing fails. /// Adds a new multiaddr to attempt if the current dialing fails.
/// ///
/// Doesn't do anything if that multiaddress is already in the queue. /// Doesn't do anything if that multiaddress is already in the queue.

14
core/src/swarm.rs
View File

@ -47,7 +47,7 @@ use crate::{
nodes::{ nodes::{
handled_node::NodeHandler, handled_node::NodeHandler,
node::Substream, node::Substream,
raw_swarm::{RawSwarm, RawSwarmEvent} raw_swarm::{self, RawSwarm, RawSwarmEvent}
}, },
protocols_handler::{NodeHandlerWrapperBuilder, NodeHandlerWrapper, IntoProtocolsHandler, ProtocolsHandler}, protocols_handler::{NodeHandlerWrapperBuilder, NodeHandlerWrapper, IntoProtocolsHandler, ProtocolsHandler},
transport::TransportError, transport::TransportError,
@ -180,9 +180,15 @@ where TBehaviour: NetworkBehaviour,
#[inline] #[inline]
pub fn dial(me: &mut Self, peer_id: PeerId) { pub fn dial(me: &mut Self, peer_id: PeerId) {
let addrs = me.behaviour.addresses_of_peer(&peer_id); let addrs = me.behaviour.addresses_of_peer(&peer_id);
let handler = me.behaviour.new_handler().into_node_handler_builder(); match me.raw_swarm.peer(peer_id.clone()) {
if let Some(peer) = me.raw_swarm.peer(peer_id).into_not_connected() { raw_swarm::Peer::NotConnected(peer) => {
let _ = peer.connect_iter(addrs, handler); let handler = me.behaviour.new_handler().into_node_handler_builder();
let _ = peer.connect_iter(addrs, handler);
},
raw_swarm::Peer::PendingConnect(mut peer) => {
peer.append_multiaddr_attempts(addrs)
},
raw_swarm::Peer::Connected(_) | raw_swarm::Peer::LocalNode => {}
} }
} }