net: delete duplicate listenerSockaddr

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/7299067

diff --git a/src/pkg/net/sock_bsd.go b/src/pkg/net/sock_bsd.go
index 2607b04c7bc777d688b64cf2247c2536cb06549f..3205f94047900c1d6474ac27f5402f0e27bec480 100644 (file)
--- a/src/pkg/net/sock_bsd.go
+++ b/src/pkg/net/sock_bsd.go
@@ -4,8 +4,6 @@
 
 // +build darwin freebsd netbsd openbsd
 
-// Sockets for BSD variants
-
 package net
 
 import (
@@ -31,32 +29,3 @@ func maxListenerBacklog() int {
        }
        return int(n)
 }
-
-func listenerSockaddr(s, f int, la syscall.Sockaddr, toAddr func(syscall.Sockaddr) Addr) (syscall.Sockaddr, error) {
-       a := toAddr(la)
-       if a == nil {
-               return la, nil
-       }
-       switch v := a.(type) {
-       case *TCPAddr, *UnixAddr:
-               err := setDefaultListenerSockopts(s)
-               if err != nil {
-                       return nil, err
-               }
-       case *UDPAddr:
-               if v.IP.IsMulticast() {
-                       err := setDefaultMulticastSockopts(s)
-                       if err != nil {
-                               return nil, err
-                       }
-                       switch f {
-                       case syscall.AF_INET:
-                               v.IP = IPv4zero
-                       case syscall.AF_INET6:
-                               v.IP = IPv6unspecified
-                       }
-                       return v.sockaddr(f)
-               }
-       }
-       return la, nil
-}

diff --git a/src/pkg/net/sock_linux.go b/src/pkg/net/sock_linux.go
index e509d93978b1205b30e9a45e83a873fd779deb27..8bbd74ddc92d1a8668cc92461103072d74371317 100644 (file)
--- a/src/pkg/net/sock_linux.go
+++ b/src/pkg/net/sock_linux.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Sockets for Linux
-
 package net
 
 import "syscall"
@@ -25,32 +23,3 @@ func maxListenerBacklog() int {
        }
        return n
 }
-
-func listenerSockaddr(s, f int, la syscall.Sockaddr, toAddr func(syscall.Sockaddr) Addr) (syscall.Sockaddr, error) {
-       a := toAddr(la)
-       if a == nil {
-               return la, nil
-       }
-       switch v := a.(type) {
-       case *TCPAddr, *UnixAddr:
-               err := setDefaultListenerSockopts(s)
-               if err != nil {
-                       return nil, err
-               }
-       case *UDPAddr:
-               if v.IP.IsMulticast() {
-                       err := setDefaultMulticastSockopts(s)
-                       if err != nil {
-                               return nil, err
-                       }
-                       switch f {
-                       case syscall.AF_INET:
-                               v.IP = IPv4zero
-                       case syscall.AF_INET6:
-                               v.IP = IPv6unspecified
-                       }
-                       return v.sockaddr(f)
-               }
-       }
-       return la, nil
-}

diff --git a/src/pkg/net/sock_posix.go b/src/pkg/net/sock_posix.go
index 9cd149e466b381237ff75af45a152f01ab45e25d..b50a892b149386d0af4a25da4d3ebe4ed0b3d8f3 100644 (file)
--- a/src/pkg/net/sock_posix.go
+++ b/src/pkg/net/sock_posix.go
@@ -4,8 +4,6 @@
 
 // +build darwin freebsd linux netbsd openbsd windows
 
-// Sockets
-
 package net
 
 import (
@@ -15,7 +13,7 @@ import (
 
 var listenerBacklog = maxListenerBacklog()
 
-// Generic socket creation.
+// Generic POSIX socket creation.
 func socket(net string, f, t, p int, ipv6only bool, ulsa, ursa syscall.Sockaddr, deadline time.Time, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err error) {
        s, err := sysSocket(f, t, p)
        if err != nil {

diff --git a/src/pkg/net/sock_unix.go b/src/pkg/net/sock_unix.go
new file mode 100644 (file)
index 0000000..b0d6d49
--- /dev/null
+++ b/src/pkg/net/sock_unix.go
@@ -0,0 +1,36 @@
+// Copyright 2009 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 darwin freebsd linux netbsd openbsd
+
+package net
+
+import "syscall"
+
+func listenerSockaddr(s, f int, la syscall.Sockaddr, toAddr func(syscall.Sockaddr) Addr) (syscall.Sockaddr, error) {
+       a := toAddr(la)
+       if a == nil {
+               return la, nil
+       }
+       switch a := a.(type) {
+       case *TCPAddr, *UnixAddr:
+               if err := setDefaultListenerSockopts(s); err != nil {
+                       return nil, err
+               }
+       case *UDPAddr:
+               if a.IP.IsMulticast() {
+                       if err := setDefaultMulticastSockopts(s); err != nil {
+                               return nil, err
+                       }
+                       switch f {
+                       case syscall.AF_INET:
+                               a.IP = IPv4zero
+                       case syscall.AF_INET6:
+                               a.IP = IPv6unspecified
+                       }
+                       return a.sockaddr(f)
+               }
+       }
+       return la, nil
+}

diff --git a/src/pkg/net/sock_windows.go b/src/pkg/net/sock_windows.go
index fc5d9e5de21e9edf3f14c209787904a2a0cd59d6..a77c48437f22c739234536c034cd75a816b41cdf 100644 (file)
--- a/src/pkg/net/sock_windows.go
+++ b/src/pkg/net/sock_windows.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Sockets for Windows
-
 package net
 
 import "syscall"
@@ -18,25 +16,23 @@ func listenerSockaddr(s syscall.Handle, f int, la syscall.Sockaddr, toAddr func(
        if a == nil {
                return la, nil
        }
-       switch v := a.(type) {
+       switch a := a.(type) {
        case *TCPAddr, *UnixAddr:
-               err := setDefaultListenerSockopts(s)
-               if err != nil {
+               if err := setDefaultListenerSockopts(s); err != nil {
                        return nil, err
                }
        case *UDPAddr:
-               if v.IP.IsMulticast() {
-                       err := setDefaultMulticastSockopts(s)
-                       if err != nil {
+               if a.IP.IsMulticast() {
+                       if err := setDefaultMulticastSockopts(s); err != nil {
                                return nil, err
                        }
                        switch f {
                        case syscall.AF_INET:
-                               v.IP = IPv4zero
+                               a.IP = IPv4zero
                        case syscall.AF_INET6:
-                               v.IP = IPv6unspecified
+                               a.IP = IPv6unspecified
                        }
-                       return v.sockaddr(f)
+                       return a.sockaddr(f)
                }
        }
        return la, nil