qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 22:57:57 -07:00
Code Releases Activity

add timeout to Resolver

Browse Source
This commit is contained in:
hossinasaadi 2024-09-17 13:29:35 +04:00
parent 3d33437c45
commit d6b1041854
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/lookup.go
View File

@ -11,6 +11,7 @@ import (
"internal/singleflight" "internal/singleflight"
"net/netip" "net/netip"
"sync" "sync"
"time"
"golang.org/x/net/dns/dnsmessage" "golang.org/x/net/dns/dnsmessage"
) )
@ -164,8 +165,10 @@ type Resolver struct {
// The return values are ([]IPAddr, error). // The return values are ([]IPAddr, error).
lookupGroup singleflight.Group lookupGroup singleflight.Group
// Timeout is the time to spend Resolving
Timeout time.Duration
// TODO(bradfitz): optional interface impl override hook // TODO(bradfitz): optional interface impl override hook
// TODO(bradfitz): Timeout time.Duration?
} }
func (r *Resolver) preferGo() bool { return r != nil && r.PreferGo } func (r *Resolver) preferGo() bool { return r != nil && r.PreferGo }
@ -678,12 +681,21 @@ func (r *Resolver) dial(ctx context.Context, network, server string) (Conn, erro
// call back here to translate it. The DNS config parser has // call back here to translate it. The DNS config parser has
// already checked that all the cfg.servers are IP // already checked that all the cfg.servers are IP
// addresses, which Dial will use without a DNS lookup. // addresses, which Dial will use without a DNS lookup.
if r.Timeout > 0 {
var cancel func()
ctx, cancel = context.WithTimeout(ctx, r.Timeout)
defer cancel()
}
var c Conn var c Conn
var err error var err error
if r != nil && r.Dial != nil { if r != nil && r.Dial != nil {
c, err = r.Dial(ctx, network, server) c, err = r.Dial(ctx, network, server)
} else { } else {
var d Dialer var d Dialer
if r.Timeout > 0 {
d.Timeout = r.Timeout
}
c, err = d.DialContext(ctx, network, server) c, err = d.DialContext(ctx, network, server)
} }
if err != nil { if err != nil {