diff options
Diffstat (limited to 'libgo/go/net/lookup_windows.go')
| -rw-r--r-- | libgo/go/net/lookup_windows.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libgo/go/net/lookup_windows.go b/libgo/go/net/lookup_windows.go index 1b6d392f660..13edc264e82 100644 --- a/libgo/go/net/lookup_windows.go +++ b/libgo/go/net/lookup_windows.go @@ -19,7 +19,7 @@ var ( func getprotobyname(name string) (proto int, err error) { p, err := syscall.GetProtoByName(name) if err != nil { - return 0, os.NewSyscallError("getorotobyname", err) + return 0, os.NewSyscallError("getprotobyname", err) } return int(p.Proto), nil } @@ -221,10 +221,7 @@ func lookupCNAME(name string) (string, error) { // windows returns DNS_INFO_NO_RECORDS if there are no CNAME-s if errno, ok := e.(syscall.Errno); ok && errno == syscall.DNS_INFO_NO_RECORDS { // if there are no aliases, the canonical name is the input name - if name == "" || name[len(name)-1] != '.' { - return name + ".", nil - } - return name, nil + return absDomainName([]byte(name)), nil } if e != nil { return "", &DNSError{Err: os.NewSyscallError("dnsquery", e).Error(), Name: name} @@ -232,8 +229,8 @@ func lookupCNAME(name string) (string, error) { defer syscall.DnsRecordListFree(r, 1) resolved := resolveCNAME(syscall.StringToUTF16Ptr(name), r) - cname := syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(resolved))[:]) + "." - return cname, nil + cname := syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(resolved))[:]) + return absDomainName([]byte(cname)), nil } func lookupSRV(service, proto, name string) (string, []*SRV, error) { @@ -255,10 +252,10 @@ func lookupSRV(service, proto, name string) (string, []*SRV, error) { srvs := make([]*SRV, 0, 10) for _, p := range validRecs(r, syscall.DNS_TYPE_SRV, target) { v := (*syscall.DNSSRVData)(unsafe.Pointer(&p.Data[0])) - srvs = append(srvs, &SRV{syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Target))[:]), v.Port, v.Priority, v.Weight}) + srvs = append(srvs, &SRV{absDomainName([]byte(syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Target))[:]))), v.Port, v.Priority, v.Weight}) } byPriorityWeight(srvs).sort() - return name, srvs, nil + return absDomainName([]byte(target)), srvs, nil } func lookupMX(name string) ([]*MX, error) { @@ -274,7 +271,7 @@ func lookupMX(name string) ([]*MX, error) { mxs := make([]*MX, 0, 10) for _, p := range validRecs(r, syscall.DNS_TYPE_MX, name) { v := (*syscall.DNSMXData)(unsafe.Pointer(&p.Data[0])) - mxs = append(mxs, &MX{syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.NameExchange))[:]) + ".", v.Preference}) + mxs = append(mxs, &MX{absDomainName([]byte(syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.NameExchange))[:]))), v.Preference}) } byPref(mxs).sort() return mxs, nil @@ -293,7 +290,7 @@ func lookupNS(name string) ([]*NS, error) { nss := make([]*NS, 0, 10) for _, p := range validRecs(r, syscall.DNS_TYPE_NS, name) { v := (*syscall.DNSPTRData)(unsafe.Pointer(&p.Data[0])) - nss = append(nss, &NS{syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Host))[:]) + "."}) + nss = append(nss, &NS{absDomainName([]byte(syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Host))[:])))}) } return nss, nil } @@ -336,7 +333,7 @@ func lookupAddr(addr string) ([]string, error) { ptrs := make([]string, 0, 10) for _, p := range validRecs(r, syscall.DNS_TYPE_PTR, arpa) { v := (*syscall.DNSPTRData)(unsafe.Pointer(&p.Data[0])) - ptrs = append(ptrs, syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Host))[:])) + ptrs = append(ptrs, absDomainName([]byte(syscall.UTF16ToString((*[256]uint16)(unsafe.Pointer(v.Host))[:])))) } return ptrs, nil } |