fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-30 02:01:35 +00:00
Code Issues Projects Releases Wiki Activity

protocols/dcutr: Upgrade at most one inbound connect request (#2695)

Browse Source 
Sending two concurrent connect requests is nonsensical. In the case where a
remote sends two, the earlier is dropped in favor of the latter.
This commit is contained in:
Max Inden
2022-06-07 14:52:35 +02:00
committed by GitHub
parent 676a630875
commit 59a74b4083
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protocols/dcutr/CHANGELOG.md
View File

@ -1,3 +1,7 @@
# 0.3.1 - unreleased
- Upgrade at most one inbound connect request.
# 0.3.0 # 0.3.0
- Update to `libp2p-core` `v0.33.0`. - Update to `libp2p-core` `v0.33.0`.

2
protocols/dcutr/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "libp2p-dcutr"
edition = "2021" edition = "2021"
rust-version = "1.56.1" rust-version = "1.56.1"
description = "Direct connection upgrade through relay" description = "Direct connection upgrade through relay"
version = "0.3.0" version = "0.3.1"
authors = ["Max Inden <mail@max-inden.de>"] authors = ["Max Inden <mail@max-inden.de>"]
license = "MIT" license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p" repository = "https://github.com/libp2p/rust-libp2p"

24
protocols/dcutr/src/handler/relayed.rs
View File

@ -22,7 +22,6 @@
use crate::protocol; use crate::protocol;
use futures::future::{BoxFuture, FutureExt}; use futures::future::{BoxFuture, FutureExt};
use futures::stream::{FuturesUnordered, StreamExt};
use instant::Instant; use instant::Instant;
use libp2p_core::either::{EitherError, EitherOutput}; use libp2p_core::either::{EitherError, EitherOutput};
use libp2p_core::multiaddr::Multiaddr; use libp2p_core::multiaddr::Multiaddr;
@ -144,10 +143,9 @@ pub struct Handler {
<Self as ConnectionHandler>::Error, <Self as ConnectionHandler>::Error,
>, >,
>, >,
/// Inbound connects, accepted by the behaviour, pending completion. /// Inbound connect, accepted by the behaviour, pending completion.
inbound_connects: FuturesUnordered< inbound_connect:
BoxFuture<'static, Result<Vec<Multiaddr>, protocol::inbound::UpgradeError>>, Option<BoxFuture<'static, Result<Vec<Multiaddr>, protocol::inbound::UpgradeError>>>,
>,
keep_alive: KeepAlive, keep_alive: KeepAlive,
} }
@ -157,7 +155,7 @@ impl Handler {
endpoint, endpoint,
pending_error: Default::default(), pending_error: Default::default(),
queued_events: Default::default(), queued_events: Default::default(),
inbound_connects: Default::default(), inbound_connect: Default::default(),
keep_alive: KeepAlive::Until(Instant::now() + Duration::from_secs(30)), keep_alive: KeepAlive::Until(Instant::now() + Duration::from_secs(30)),
} }
} }
@ -247,8 +245,15 @@ impl ConnectionHandler for Handler {
inbound_connect, inbound_connect,
obs_addrs, obs_addrs,
} => { } => {
self.inbound_connects if let Some(_) = self
.push(inbound_connect.accept(obs_addrs).boxed()); .inbound_connect
.replace(inbound_connect.accept(obs_addrs).boxed())
{
log::warn!(
"New inbound connect stream while still upgrading previous one. \
Replacing previous with new.",
);
}
} }
Command::UpgradeFinishedDontKeepAlive => { Command::UpgradeFinishedDontKeepAlive => {
self.keep_alive = KeepAlive::No; self.keep_alive = KeepAlive::No;
@ -364,7 +369,8 @@ impl ConnectionHandler for Handler {
return Poll::Ready(event); return Poll::Ready(event);
} }
while let Poll::Ready(Some(result)) = self.inbound_connects.poll_next_unpin(cx) { if let Some(Poll::Ready(result)) = self.inbound_connect.as_mut().map(|f| f.poll_unpin(cx)) {
self.inbound_connect = None;
match result { match result {
Ok(addresses) => { Ok(addresses) => {
return Poll::Ready(ConnectionHandlerEvent::Custom( return Poll::Ready(ConnectionHandlerEvent::Custom(