ipv4, ipv6, internal/netreflect, bpf: fix the x/net build

The x/net package is currently broken for Go 1.9 (#19051) so
I am unable to use trybots for x/net/http2.

This disables the tests for the broken stuff and makes things compile
at least, so x/net trybots aren't broken for others.

Updates golang/go#19051

Change-Id: I67401d7ad32d855e99a417545328eb4e803287cc
Reviewed-on: https://go-review.googlesource.com/37401
Run-TryBot: Brad Fitzpatrick <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Matt Layher <[email protected]>
Reviewed-by: Martin Möhrmann <[email protected]>

Author: bradfitz

bpf/vm_bpf_test.go

@@ -149,6 +149,9 @@ func testOSVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func()) {
 
 	p := ipv4.NewPacketConn(l)
 	if err = p.SetBPF(prog); err != nil {
+		if err.Error() == "operation not supported" { // TODO: gross. remove once 19051 fixed.
+			t.Skip("Skipping until Issue 19051 is fixed.")
+		}
 		t.Fatalf("failed to attach BPF program to listener: %v", err)
 	}
 

internal/netreflect/socket_19.go

@@ -0,0 +1,37 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.9
+
+package netreflect
+
+import (
+	"errors"
+	"net"
+)
+
+var (
+	errInvalidType = errors.New("invalid type")
+	errOpNoSupport = errors.New("operation not supported")
+)
+
+// SocketOf returns the socket descriptor of c.
+func SocketOf(c net.Conn) (uintptr, error) {
+	switch c.(type) {
+	case *net.TCPConn, *net.UDPConn, *net.IPConn, *net.UnixConn:
+		return 0, errOpNoSupport
+	default:
+		return 0, errInvalidType
+	}
+}
+
+// PacketSocketOf returns the socket descriptor of c.
+func PacketSocketOf(c net.PacketConn) (uintptr, error) {
+	switch c.(type) {
+	case *net.UDPConn, *net.IPConn, *net.UnixConn:
+		return 0, errOpNoSupport
+	default:
+		return 0, errInvalidType
+	}
+}

ipv4/go19_test.go

@@ -0,0 +1,11 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.9
+
+package ipv4
+
+func init() {
+	disableTests = true
+}

ipv4/ipv4_test.go

@@ -0,0 +1,22 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ipv4
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+var disableTests = false
+
+func TestMain(m *testing.M) {
+	if disableTests {
+		fmt.Fprintf(os.Stderr, "ipv4 tests disabled in Go 1.9 until netreflect is fixed. (Issue 19051)\n")
+		os.Exit(0)
+	}
+	// call flag.Parse() here if TestMain uses flags
+	os.Exit(m.Run())
+}

ipv6/go19_test.go

@@ -0,0 +1,11 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.9
+
+package ipv6
+
+func init() {
+	disableTests = true
+}

ipv6/ipv6_test.go

@@ -0,0 +1,22 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ipv6
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+var disableTests = false
+
+func TestMain(m *testing.M) {
+	if disableTests {
+		fmt.Fprintf(os.Stderr, "ipv6 tests disabled in Go 1.9 until netreflect is fixed (Issue 19051)\n")
+		os.Exit(0)
+	}
+	// call flag.Parse() here if TestMain uses flags
+	os.Exit(m.Run())
+}