Skip to content
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.

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

Do not block during ephemeral peer exchange #7374

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Do not block during ephemeral peer exchange #7374

merged 2 commits into from
Dec 19, 2024

Conversation

dlon
Copy link
Member

@dlon dlon commented Dec 19, 2024

This is due to #7348. Previously, this could panic since some Tunnel implementations use block_on. This was due to a bug where a blocking function was called during ephemeral peer exchange.

Since spawn_blocking demands a static lifetime, the fix involves using block_in_place.


This change is Reviewable

@dlon dlon force-pushed the block-on-duct-tape branch from 3313051 to 94b6507 Compare December 19, 2024 07:52
@dlon dlon marked this pull request as ready for review December 19, 2024 07:58
@dlon dlon force-pushed the block-on-duct-tape branch from 94b6507 to 5c8308a Compare December 19, 2024 08:02
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dlon dlon force-pushed the block-on-duct-tape branch from 5c8308a to 3030cfe Compare December 19, 2024 09:04
@dlon dlon merged commit 6039cb1 into main Dec 19, 2024
53 checks passed
@dlon dlon deleted the block-on-duct-tape branch December 19, 2024 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants