debugging

Change-Id: I6ce84c62c786f7c96dd8848ffec30701789502dd

Author: mateusz834

src/net/cgo_unix.go

@@ -80,7 +80,7 @@ func cgoLookupHost(ctx context.Context, name string) (hosts []string, err error)
 func cgoLookupPort(ctx context.Context, network, service string) (port int, err error) {
 	var hints _C_struct_addrinfo
 	switch network {
-	case "": // no hints
+	case "ip": // no hints
 	case "tcp", "tcp4", "tcp6":
 		*_C_ai_socktype(&hints) = _C_SOCK_STREAM
 		*_C_ai_protocol(&hints) = _C_IPPROTO_TCP

src/net/lookup.go

@@ -83,12 +83,20 @@ const maxPortBufSize = len("mobility-header") + 10
 
 func lookupPortMap(network, service string) (port int, error error) {
 	switch network {
-	case "tcp4", "tcp6":
-		network = "tcp"
-	case "udp4", "udp6":
-		network = "udp"
+	case "ip": // no hints
+		if p, err := lookupPortMapWithNetwork("tcp", service); err == nil {
+			return p, nil
+		}
+		return lookupPortMapWithNetwork("udp", service)
+	case "tcp", "tcp4", "tcp6":
+		return lookupPortMapWithNetwork("tcp", service)
+	case "udp", "udp4", "udp6":
+		return lookupPortMapWithNetwork("udp", service)
 	}
+	return 0, &DNSError{Err: "unknown network", Name: network + "/" + service}
+}
 
+func lookupPortMapWithNetwork(network, service string) (port int, error error) {
 	if m, ok := services[network]; ok {
 		var lowerService [maxPortBufSize]byte
 		n := copy(lowerService[:], service)
@@ -415,11 +423,13 @@ func LookupPort(network, service string) (port int, err error) {
 }
 
 // LookupPort looks up the port for the given network and service.
+//
+// The network must be one of "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6" or "ip".
 func (r *Resolver) LookupPort(ctx context.Context, network, service string) (port int, err error) {
 	port, needsLookup := parsePort(service)
 	if needsLookup {
 		switch network {
-		case "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6":
+		case "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6", "ip":
 		case "": // a hint wildcard for Go 1.0 undocumented behavior
 			network = "ip"
 		default:

src/net/lookup_test.go

@@ -1475,6 +1475,16 @@ func TestLookupPortDifferentNetwork(t *testing.T) {
 	_, err := LookupPort("udp", "imaps")
 	var dnsErr *DNSError
 	if !errors.As(err, &dnsErr) || !dnsErr.IsNotFound {
+		// TODO remove, for debugging:
+		goLookupPort("tcp", "imaps")
+		t.Logf("services: %#v", services)
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestLookupPortEmptyNetworkString(t *testing.T) {
+	_, err := LookupPort("", "imaps")
+	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }

src/net/lookup_windows.go

@@ -204,6 +204,7 @@ func (r *Resolver) lookupPort(ctx context.Context, network, service string) (int
 	var hints syscall.AddrinfoW
 
 	switch network {
+	case "ip": // no hints
 	case "tcp", "tcp4", "tcp6":
 		hints.Socktype = syscall.SOCK_STREAM
 		hints.Protocol = syscall.IPPROTO_TCP

src/net/port_unix.go

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build unix || js || wasip1
+//TODO uncomment
+////go:build unix || js || wasip1
 
 // Read system port mappings from /etc/services