Repository navigation
Conversation
Without a proxy, Timeout didn't bound connecting to a resolver. A DoT resolver that accepted the TCP connection but never answered the TLS handshake blocked a query forever, and a TCP connect waited as long as the operating system allowed. dns.Client applies its Timeout to a dial only when it builds the net.Dialer itself. Since 31b6504 every client carries a Dialer of ours that sets only LocalAddr, so the dial lost its timeout. When c9f6172 (#306) bounded proxied connections, it did so inside dialProxy, and the direct branch of dial never got the same treatment. Apply Timeout in dial, which every TCP, DoT and unpooled UDP connection goes through, and dial directly with DialContext, so both branches share one deadline covering the connect and the TLS and proxy handshakes. A zero Timeout still leaves connecting unbounded. Fixes: #311 Signed-off-by: Dwi Siswanto <git@dw1.io>
Mzack9999
approved these changes
Oct 25, 2026
Mzack9999
deleted the
dwisiswant0/fix/client/bound-direct-resolver-connections-by-timeout
branch
October 25, 2026 10:58
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
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.
Without a proxy, Timeout didn't bound connecting to a resolver. A DoT
resolver that accepted the TCP connection but never answered the TLS
handshake blocked a query forever, and a TCP connect waited as long
as the operating system allowed.
dns.Client applies its Timeout to a dial only when it builds the
net.Dialer itself. Since 31b6504 every client carries a Dialer of
ours that sets only LocalAddr, so the dial lost its timeout. When
c9f6172 (#306) bounded proxied connections, it did so inside
dialProxy, and the direct branch of dial never got the same
treatment.
Apply Timeout in dial, which every TCP, DoT and unpooled UDP
connection goes through, and dial directly with DialContext, so both
branches share one deadline covering the connect and the TLS and proxy
handshakes. A zero Timeout still leaves connecting unbounded.
Fixes: #311