Imported Upstream version 2011.05.22

1 files changed, 1 insertions, 24 deletions

diff --git a/src/pkg/net/sock.go b/src/pkg/net/sock.go
index bd88f7ece..5c47e4f77 100644
--- a/src/pkg/net/sock.go
+++ b/src/pkg/net/sock.go
@@ -32,17 +32,7 @@ func socket(net string, f, p, t int, la, ra syscall.Sockaddr, toAddr func(syscal
 	syscall.CloseOnExec(s)
 	syscall.ForkLock.RUnlock()
 
-	// Allow reuse of recently-used addresses.
-	syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1)
-
-	// Allow broadcast.
-	syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_BROADCAST, 1)
-
-	if f == syscall.AF_INET6 {
-		// using ip, tcp, udp, etc.
-		// allow both protocols even if the OS default is otherwise.
-		syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0)
-	}
+	setKernelSpecificSockopt(s, f)
 
 	if la != nil {
 		e = syscall.Bind(s, la)
@@ -163,16 +153,3 @@ type UnknownSocketError struct {
 func (e *UnknownSocketError) String() string {
 	return "unknown socket address type " + reflect.TypeOf(e.sa).String()
 }
-
-func sockaddrToString(sa syscall.Sockaddr) (name string, err os.Error) {
-	switch a := sa.(type) {
-	case *syscall.SockaddrInet4:
-		return JoinHostPort(IP(a.Addr[0:]).String(), itoa(a.Port)), nil
-	case *syscall.SockaddrInet6:
-		return JoinHostPort(IP(a.Addr[0:]).String(), itoa(a.Port)), nil
-	case *syscall.SockaddrUnix:
-		return a.Name, nil
-	}
-
-	return "", &UnknownSocketError{sa}
-}