Skip to content

fix: use DiscoPing (partially reverts #11306) #11744

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

Merged
merged 1 commit into from
Jan 22, 2024

Conversation

spikecurtis
Copy link
Contributor

fixes #11732

This PR reverts the main focus of #11306 which returns us to using Disco instead of TSMP for pings. TSMP doesn't support giving us information about whether we got the response via DERP or direct.

I've left the test changes from #11306 in place because I still want to use TSMP for AwaitReachable() eventually, but I'm going to hotfix this PR so we can get a patch ASAP.

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @spikecurtis and the rest of your teammates on Graphite Graphite

Copy link

@cdr-bot cdr-bot bot left a comment

Choose a reason for hiding this comment

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

This PR is a hotfix and has been automatically approved.

  • ✅ Base is main
  • ✅ Has hotfix label
  • ✅ Head is from coder/coder
  • ✅ Less than 100 lines

@spikecurtis spikecurtis enabled auto-merge (squash) January 22, 2024 12:35
@spikecurtis spikecurtis merged commit 7ffd99c into main Jan 22, 2024
@spikecurtis spikecurtis deleted the spike/11732-revert-disco-ping branch January 22, 2024 12:40
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: Direct connections no longer work in 2.7.0 - they worked in 2.6.0
1 participant