diff options
Diffstat (limited to 'libgo/go/net/ipsock.go')
| -rw-r--r-- | libgo/go/net/ipsock.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libgo/go/net/ipsock.go b/libgo/go/net/ipsock.go index f4ff82b..7d0684d 100644 --- a/libgo/go/net/ipsock.go +++ b/libgo/go/net/ipsock.go @@ -6,6 +6,7 @@ package net import ( "context" + "internal/bytealg" "sync" ) @@ -170,7 +171,7 @@ func SplitHostPort(hostport string) (host, port string, err error) { if hostport[0] == '[' { // Expect the first ']' just before the last ':'. - end := byteIndex(hostport, ']') + end := bytealg.IndexByteString(hostport, ']') if end < 0 { return addrErr(hostport, "missing ']' in address") } @@ -192,14 +193,14 @@ func SplitHostPort(hostport string) (host, port string, err error) { j, k = 1, end+1 // there can't be a '[' resp. ']' before these positions } else { host = hostport[:i] - if byteIndex(host, ':') >= 0 { + if bytealg.IndexByteString(host, ':') >= 0 { return addrErr(hostport, tooManyColons) } } - if byteIndex(hostport[j:], '[') >= 0 { + if bytealg.IndexByteString(hostport[j:], '[') >= 0 { return addrErr(hostport, "unexpected '[' in address") } - if byteIndex(hostport[k:], ']') >= 0 { + if bytealg.IndexByteString(hostport[k:], ']') >= 0 { return addrErr(hostport, "unexpected ']' in address") } @@ -226,7 +227,7 @@ func splitHostZone(s string) (host, zone string) { func JoinHostPort(host, port string) string { // We assume that host is a literal IPv6 address if host has // colons. - if byteIndex(host, ':') >= 0 { + if bytealg.IndexByteString(host, ':') >= 0 { return "[" + host + "]:" + port } return host + ":" + port @@ -276,7 +277,7 @@ func (r *Resolver) internetAddrList(ctx context.Context, net, addr string) (addr } // Try as a literal IP address, then as a DNS name. - ips, err := r.LookupIPAddr(ctx, host) + ips, err := r.lookupIPAddr(ctx, net, host) if err != nil { return nil, err } |