Skip to content

fix(relay/client): only try to forward handler events once #5765

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
merged 9 commits into from
Jan 27, 2025
Merged

fix(relay/client): only try to forward handler events once #5765

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
935e903
relay: remove duplicate forwarding of handler events
elenaf9 Dec 25, 2024
adb8660
relay: also rm pending handler event if connection is relayed
elenaf9 Dec 25, 2024
7dd8955
Merge branch 'master' into relay/fix-forwarding-handler-commands
dariusc93 Dec 28, 2024
bdf148c
Merge branch 'master' into relay/fix-forwarding-handler-commands
dariusc93 Jan 4, 2025
11b4bc7
Merge branch 'master' into relay/fix-forwarding-handler-commands
dariusc93 Jan 9, 2025
68797f2
Merge branch 'master' into relay/fix-forwarding-handler-commands
elenaf9 Jan 14, 2025
47ece71
Merge branch 'master' into relay/fix-forwarding-handler-commands
elenaf9 Jan 16, 2025
bc42c11
Merge branch 'master' into relay/fix-forwarding-handler-commands
dariusc93 Jan 21, 2025
1b8c430
relay: bump version, add changelog entry
elenaf9 Jan 26, 2025
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
28 changes: 11 additions & 17 deletions protocols/relay/src/priv_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,14 @@ impl NetworkBehaviour for Behaviour {
local_addr: &Multiaddr,
remote_addr: &Multiaddr,
) -> Result<THandler<Self>, ConnectionDenied> {
let pending_handler_command = self.pending_handler_commands.remove(&connection_id);

if local_addr.is_relayed() {
return Ok(Either::Right(dummy::ConnectionHandler));
}
let mut handler = Handler::new(self.local_peer_id, peer, remote_addr.clone());

if let Some(event) = self.pending_handler_commands.remove(&connection_id) {
if let Some(event) = pending_handler_command {
handler.on_behaviour_event(event)
}

Expand All @@ -188,13 +190,15 @@ impl NetworkBehaviour for Behaviour {
_: Endpoint,
_: PortUse,
) -> Result<THandler<Self>, ConnectionDenied> {
let pending_handler_command = self.pending_handler_commands.remove(&connection_id);

if addr.is_relayed() {
return Ok(Either::Right(dummy::ConnectionHandler));
}

let mut handler = Handler::new(self.local_peer_id, peer, addr.clone());

if let Some(event) = self.pending_handler_commands.remove(&connection_id) {
if let Some(event) = pending_handler_command {
handler.on_behaviour_event(event)
}

Expand All @@ -208,21 +212,11 @@ impl NetworkBehaviour for Behaviour {
connection_id,
endpoint,
..
}) => {
if !endpoint.is_relayed() {
self.directly_connected_peers
.entry(peer_id)
.or_default()
.push(connection_id);
}

if let Some(event) = self.pending_handler_commands.remove(&connection_id) {
self.queued_actions.push_back(ToSwarm::NotifyHandler {
peer_id,
handler: NotifyHandler::One(connection_id),
event: Either::Left(event),
})
}
}) if !endpoint.is_relayed() => {
self.directly_connected_peers
.entry(peer_id)
.or_default()
.push(connection_id);
}
FromSwarm::ConnectionClosed(connection_closed) => {
self.on_connection_closed(connection_closed)
Expand Down
Loading