Skip to content

fix(swarm): poll handler after injecting LocalProtocolsChange event #3979

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 2 commits into from
May 24, 2023
Merged

fix(swarm): poll handler after injecting LocalProtocolsChange event #3979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eb6c2f
Fix starved connection handler on local-protocols change event
thomaseizinger May 23, 2023
6325386
Merge branch 'master' into fix/connection-stalled
mergify[bot] May 24, 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
13 changes: 9 additions & 4 deletions swarm/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,17 @@ where
}

let new_protocols = gather_supported_protocols(handler);
let changes = ProtocolsChange::from_full_sets(supported_protocols, &new_protocols);

for change in ProtocolsChange::from_full_sets(supported_protocols, &new_protocols) {
handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(change));
}
if !changes.is_empty() {
for change in changes {
handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(change));
}

*supported_protocols = new_protocols;
*supported_protocols = new_protocols;

continue; // Go back to the top, handler can potentially make progress again.
}

return Poll::Pending; // Nothing can make progress, return `Pending`.
}
Expand Down