From 2a6501a53e1b2c5195c3869d528a40e7f93d6225 Mon Sep 17 00:00:00 2001 From: Mateusz Poliwczak Date: Tue, 2 May 2023 14:57:05 +0200 Subject: [PATCH] update --- src/net/cgo_unix.go | 9 +++++---- src/net/lookup_unix.go | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/cgo_unix.go b/src/net/cgo_unix.go index ab501aff50..f10f3ea60b 100644 --- a/src/net/cgo_unix.go +++ b/src/net/cgo_unix.go @@ -14,7 +14,6 @@ package net import ( "context" "errors" - "fmt" "net/netip" "syscall" "unsafe" @@ -69,10 +68,13 @@ func doBlockingWithCtx[T any](ctx context.Context, blocking func() (T, error)) ( func cgoLookupHost(ctx context.Context, name string) (hosts []string, err error) { addrs, err := cgoLookupIP(ctx, "ip", name) + if err != nil { + return nil, err + } for _, addr := range addrs { hosts = append(hosts, addr.String()) } - return + return hosts, nil } func cgoLookupPort(ctx context.Context, network, service string) (port int, err error) { @@ -298,7 +300,7 @@ func cgoLookupCNAME(ctx context.Context, name string) (cname string, err error, } cname, err = parseCNAMEFromResources(resources) if err != nil { - return + return "", err, false } return cname, nil, true } @@ -343,7 +345,6 @@ func cgoResSearch(hostname string, rtype, class int) ([]dnsmessage.Resource, err for { size, _ = _C_res_nsearch(state, (*_C_char)(unsafe.Pointer(s)), class, rtype, buf, bufSize) if size <= 0 || size > 0xffff { - fmt.Println(size) return nil, errors.New("res_nsearch failure") } if size <= bufSize { diff --git a/src/net/lookup_unix.go b/src/net/lookup_unix.go index 138a1e0480..6607b5996a 100644 --- a/src/net/lookup_unix.go +++ b/src/net/lookup_unix.go @@ -96,7 +96,6 @@ func (r *Resolver) lookupCNAME(ctx context.Context, name string) (string, error) if cname, err, ok := cgoLookupCNAME(ctx, name); ok { return cname, err } - } return r.goLookupCNAME(ctx, name, order, conf) }