diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2015-12-17 18:14:52 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2015-12-17 18:43:12 +0000 |
| commit | 807c6c58fc7de3cdabe41d71c9e18ddaa1870cab (patch) | |
| tree | 3c89eeb03a8819bc97612f6b49b9536da5e0f75d | |
| parent | d270a6794b662db0735b34d244fffb63430aa471 (diff) | |
| download | go-807c6c58fc7de3cdabe41d71c9e18ddaa1870cab.tar.gz go-807c6c58fc7de3cdabe41d71c9e18ddaa1870cab.zip | |
net: fix the build even harder
Should fix nacl.
Follow-up to
https://golang.org/cl/17936 (fix race) and
https://golang.org/cl/17914 (fix build) for
https://golang.org/cl/16953 (broke the build)
Third time's a charm.
Change-Id: I23930d5cff4235209546952ce2231f165ab5bf8a
Reviewed-on: https://go-review.googlesource.com/17939
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
| -rw-r--r-- | src/net/dnsclient_unix.go | 2 | ||||
| -rw-r--r-- | src/net/hook_unix.go | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go index 15a4081835..17188f0024 100644 --- a/src/net/dnsclient_unix.go +++ b/src/net/dnsclient_unix.go @@ -29,6 +29,8 @@ type dnsDialer interface { dialDNS(string, string) (dnsConn, error) } +var testHookDNSDialer = func(d time.Duration) dnsDialer { return &Dialer{Timeout: d} } + // A dnsConn represents a DNS transport endpoint. type dnsConn interface { io.Closer diff --git a/src/net/hook_unix.go b/src/net/hook_unix.go index 15c6a18a8a..361ca5980c 100644 --- a/src/net/hook_unix.go +++ b/src/net/hook_unix.go @@ -6,14 +6,10 @@ package net -import ( - "syscall" - "time" -) +import "syscall" var ( testHookDialChannel = func() {} // see golang.org/issue/5349 - testHookDNSDialer = func(d time.Duration) dnsDialer { return &Dialer{Timeout: d} } // Placeholders for socket system calls. socketFunc func(int, int, int) (int, error) = syscall.Socket |