From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Mon, 13 Feb 2012 03:45:59 +0000 (+0900)
Subject: net: disable wild use of SO_REUSEPORT on BSD variants
X-Git-Tag: weekly.2012-02-14~103
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6fa2296e839d7cea090fd9bddc9831ea6186c30e;p=gostls13.git

net: disable wild use of SO_REUSEPORT on BSD variants

Fixes #2830 (again).

R=rsc
CC=golang-dev
https://golang.org/cl/5651083
---

diff --git a/src/pkg/net/sockopt_bsd.go b/src/pkg/net/sockopt_bsd.go
index 519d2fb05a..79e0e57e21 100644
--- a/src/pkg/net/sockopt_bsd.go
+++ b/src/pkg/net/sockopt_bsd.go
@@ -34,14 +34,6 @@ func setDefaultListenerSockopts(s int) error {
 	if err != nil {
 		return os.NewSyscallError("setsockopt", err)
 	}
-	// Allow reuse of recently-used ports.
-	// This option is supported only in descendants of 4.4BSD,
-	// to make an effective multicast application and an application
-	// that requires quick draw possible.
-	err = syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEPORT, 1)
-	if err != nil {
-		return os.NewSyscallError("setsockopt", err)
-	}
 	return nil
 }
 
@@ -52,6 +44,10 @@ func setDefaultMulticastSockopts(s int) error {
 	if err != nil {
 		return os.NewSyscallError("setsockopt", err)
 	}
+	// Allow reuse of recently-used ports.
+	// This option is supported only in descendants of 4.4BSD,
+	// to make an effective multicast application that requires
+	// quick draw possible.
 	err = syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEPORT, 1)
 	if err != nil {
 		return os.NewSyscallError("setsockopt", err)