Skip to content

fix(dcutr): always check for relayed connection first #3982

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
mergify merged 11 commits into from
May 31, 2023
Merged

fix(dcutr): always check for relayed connection first #3982

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ed1427
Fix DCUtR NetworkBehavior's established connection handler
arpankapoor May 24, 2023
bf1dfce
Use early return
arpankapoor May 25, 2023
770e9d0
Assert that outgoing_direct_connection_attempts entry was removed
arpankapoor May 25, 2023
527371e
Fix failing test
arpankapoor May 25, 2023
3b444eb
Add back removal of outgoing_direct_connection_attempts entry
arpankapoor May 25, 2023
5e9e0a3
Add assert on Listener for outgoing_direct_connection_attempts entry …
arpankapoor May 26, 2023
d1aba5f
Return dummy handler directly in inbound handler
arpankapoor May 29, 2023
b3c0996
Fix clippy warning
arpankapoor May 29, 2023
5948aee
Add comment
arpankapoor May 30, 2023
981735b
Merge branch 'master' into dcutr-fix
thomaseizinger May 30, 2023
bf8d1b6
Merge branch 'master' into dcutr-fix
mergify[bot] May 31, 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
82 changes: 32 additions & 50 deletions protocols/dcutr/src/behaviour_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,32 +246,23 @@ impl NetworkBehaviour for Behaviour {
local_addr: &Multiaddr,
remote_addr: &Multiaddr,
) -> Result<THandler<Self>, ConnectionDenied> {
match self
.outgoing_direct_connection_attempts
.remove(&(connection_id, peer))
if is_relayed(local_addr) {
Ok(Either::Left(handler::relayed::Handler::new(
ConnectedPoint::Listener {
local_addr: local_addr.clone(),
send_back_addr: remote_addr.clone(),
},
))) // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
} else if let Some(&relayed_connection_id) =
self.direct_to_relayed_connections.get(&connection_id)
Comment thread
thomaseizinger marked this conversation as resolved.
Outdated
{
None => {
let handler = if is_relayed(local_addr) {
Either::Left(handler::relayed::Handler::new(ConnectedPoint::Listener {
local_addr: local_addr.clone(),
send_back_addr: remote_addr.clone(),
})) // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
} else {
Either::Right(Either::Right(dummy::ConnectionHandler))
};

Ok(handler)
}
Some(_) => {
assert!(
!is_relayed(local_addr),
"`Prototype::DirectConnection` is never created for relayed connection."
);

Ok(Either::Right(Either::Left(
handler::direct::Handler::default(),
)))
}
self.outgoing_direct_connection_attempts
.remove(&(relayed_connection_id, peer));
Ok(Either::Right(Either::Left(
handler::direct::Handler::default(),
)))
} else {
Ok(Either::Right(Either::Right(dummy::ConnectionHandler)))
}
}

Expand All @@ -282,32 +273,23 @@ impl NetworkBehaviour for Behaviour {
addr: &Multiaddr,
role_override: Endpoint,
) -> Result<THandler<Self>, ConnectionDenied> {
match self
.outgoing_direct_connection_attempts
.remove(&(connection_id, peer))
if is_relayed(addr) {
Ok(Either::Left(handler::relayed::Handler::new(
ConnectedPoint::Dialer {
address: addr.clone(),
role_override,
},
))) // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
} else if let Some(&relayed_connection_id) =
self.direct_to_relayed_connections.get(&connection_id)
{
None => {
let handler = if is_relayed(addr) {
Either::Left(handler::relayed::Handler::new(ConnectedPoint::Dialer {
address: addr.clone(),
role_override,
})) // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
} else {
Either::Right(Either::Right(dummy::ConnectionHandler))
};

Ok(handler)
}
Some(_) => {
assert!(
!is_relayed(addr),
"`Prototype::DirectConnection` is never created for relayed connection."
);

Ok(Either::Right(Either::Left(
handler::direct::Handler::default(),
)))
}
Comment thread
thomaseizinger marked this conversation as resolved.
self.outgoing_direct_connection_attempts
.remove(&(relayed_connection_id, peer));
Comment thread
thomaseizinger marked this conversation as resolved.
Outdated
Ok(Either::Right(Either::Left(
handler::direct::Handler::default(),
)))
} else {
Comment thread
thomaseizinger marked this conversation as resolved.
Outdated
Ok(Either::Right(Either::Right(dummy::ConnectionHandler)))
}
}

Expand Down