fix(dns): add timeout context for DBus checkResolved calls#4165
Open
hklcf wants to merge 1 commit into
Open
Conversation
Use context.WithTimeout with DNSTimeout (10s) instead of bare context.Background() when calling checkResolved via DBus. If systemd-resolved or the DBus daemon becomes unresponsive, the call would previously block indefinitely. Fixes SagerNet#4160
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The \checkResolved\ method in \local_resolved_linux.go\ was called with \context.Background()\ from both \Exchange()\ and \updateStatus(), passing it into \CallWithContext()\ for DBus operations. This meant there was no application-level timeout or cancellation mechanism.
Fix
Wrap the context with \context.WithTimeout\ using \C.DNSTimeout\ (10s) before passing to \checkResolved(). If the DBus operation hangs, the timeout ensures the call returns instead of blocking indefinitely.
Related Issue
Fixes #4160