diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-09-20 19:45:37 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-09-21 18:35:40 +0000 |
| commit | 2bc5f1258e049e1d59711046e5c865500eefa159 (patch) | |
| tree | 3311516d5c2543393d75ce8bb1dfb93ea742dc1e /src/net/dnsclient_unix.go | |
| parent | ea143c299040f8a270fb782c5efd3a3a5e6057a4 (diff) | |
| download | go-2bc5f1258e049e1d59711046e5c865500eefa159.tar.gz go-2bc5f1258e049e1d59711046e5c865500eefa159.zip | |
net: add Resolver type, Dialer.Resolver, and DefaultResolver
The new Resolver type (a struct) has 9 Lookup methods, all taking a
context.Context.
There's now a new DefaultResolver global, like http's
DefaultTransport and DefaultClient.
net.Dialer now has an optional Resolver field to set the Resolver.
This also does finishes some resolver cleanup internally, deleting
lookupIPMerge and renaming lookupIPContext into Resolver.LookupIPAddr.
The Resolver currently doesn't let you tweak much, but it's a struct
specifically so we can add knobs in the future. Currently I just added
a bool to force the pure Go resolver. In the future we could let
people provide an interface to implement the methods, or add a Timeout
time.Duration, which would wrap all provided contexts in a
context.WithTimeout.
Fixes #16672
Change-Id: I7ba1f886704f06def7b6b5c4da9809db51bc1495
Reviewed-on: https://go-review.googlesource.com/29440
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/dnsclient_unix.go')
| -rw-r--r-- | src/net/dnsclient_unix.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go index 98be7a873dc..130e4c958a0 100644 --- a/src/net/dnsclient_unix.go +++ b/src/net/dnsclient_unix.go @@ -456,8 +456,9 @@ func goLookupIPFiles(name string) (addrs []IPAddr) { // goLookupIP is the native Go implementation of LookupIP. // The libc versions are in cgo_*.go. -func goLookupIP(ctx context.Context, name string) (addrs []IPAddr, err error) { - return goLookupIPOrder(ctx, name, hostLookupFilesDNS) +func goLookupIP(ctx context.Context, host string) (addrs []IPAddr, err error) { + order := systemConf().hostLookupOrder(host) + return goLookupIPOrder(ctx, host, order) } func goLookupIPOrder(ctx context.Context, name string, order hostLookupOrder) (addrs []IPAddr, err error) { |