internal/nettest: drop causesIPv6Crash
The causesIPv6Crash helper function was only needed on macOS 10.8 and
before. However, Go 1.11 requires at least macOS 10.11, so drop the
check altogether. Also remove the unused implementations for all other
geese.
Change-Id: I7459f942374e7e2e6c14b787e2dfc493de67bedc
Reviewed-on: https://go-review.googlesource.com/c/156497
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/internal/nettest/helper_bsd.go b/internal/nettest/helper_bsd.go
index a6e433b..4025bd2 100644
--- a/internal/nettest/helper_bsd.go
+++ b/internal/nettest/helper_bsd.go
@@ -8,28 +8,8 @@
import (
"runtime"
- "strconv"
- "strings"
- "syscall"
)
-var darwinVersion int
-
-func init() {
- if runtime.GOOS == "darwin" {
- // See http://support.apple.com/kb/HT1633.
- s, err := syscall.Sysctl("kern.osrelease")
- if err != nil {
- return
- }
- ss := strings.Split(s, ".")
- if len(ss) == 0 {
- return
- }
- darwinVersion, _ = strconv.Atoi(ss[0])
- }
-}
-
func supportsIPv6MulticastDeliveryOnLoopback() bool {
switch runtime.GOOS {
case "freebsd":
@@ -38,16 +18,7 @@
// kernels don't deliver link-local scoped multicast
// packets correctly.
return false
- case "darwin":
- return !causesIPv6Crash()
default:
return true
}
}
-
-func causesIPv6Crash() bool {
- // We see some kernel crash when running IPv6 with IP-level
- // options on Darwin kernel version 12 or below.
- // See golang.org/issues/17015.
- return darwinVersion < 13
-}
diff --git a/internal/nettest/helper_nobsd.go b/internal/nettest/helper_nobsd.go
index 1611a90..bfcaee9 100644
--- a/internal/nettest/helper_nobsd.go
+++ b/internal/nettest/helper_nobsd.go
@@ -9,7 +9,3 @@
func supportsIPv6MulticastDeliveryOnLoopback() bool {
return true
}
-
-func causesIPv6Crash() bool {
- return false
-}
diff --git a/internal/nettest/helper_stub.go b/internal/nettest/helper_stub.go
index d89cf29..2eeeb35 100644
--- a/internal/nettest/helper_stub.go
+++ b/internal/nettest/helper_stub.go
@@ -23,10 +23,6 @@
return false
}
-func causesIPv6Crash() bool {
- return false
-}
-
func protocolNotSupported(err error) bool {
return false
}
diff --git a/internal/nettest/helper_windows.go b/internal/nettest/helper_windows.go
index 3dcb727..b0a6a30 100644
--- a/internal/nettest/helper_windows.go
+++ b/internal/nettest/helper_windows.go
@@ -36,7 +36,3 @@
func supportsIPv6MulticastDeliveryOnLoopback() bool {
return true
}
-
-func causesIPv6Crash() bool {
- return false
-}
