net: extend sockaddr interface to the all address families

This CL extends existing sockaddr interface to accommodate not only
internet protocol family endpoint addressess but unix network family
endpoint addresses.

This is in preparation for runtime-integrated network pollster for BSD
variants.

Update #5199

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

diff --git a/src/pkg/net/ipsock_posix.go b/src/pkg/net/ipsock_posix.go
index 37827cbb2d382d546890d9180c210184a10c1748..d1940a43b9e21abd1862a7f24246bbcbc018684d 100644 (file)
--- a/src/pkg/net/ipsock_posix.go
+++ b/src/pkg/net/ipsock_posix.go
@@ -120,15 +120,6 @@ func favoriteAddrFamily(net string, laddr, raddr sockaddr, mode string) (family
 
 // Internet sockets (TCP, UDP, IP)
 
-// A sockaddr represents a TCP, UDP or IP network address that can
-// be converted into a syscall.Sockaddr.
-type sockaddr interface {
-       Addr
-       family() int
-       isWildcard() bool
-       sockaddr(family int) (syscall.Sockaddr, error)
-}
-
 func internetSocket(net string, laddr, raddr sockaddr, deadline time.Time, sotype, proto int, mode string, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err error) {
        var la, ra syscall.Sockaddr
        family, ipv6only := favoriteAddrFamily(net, laddr, raddr, mode)

diff --git a/src/pkg/net/sock_posix.go b/src/pkg/net/sock_posix.go
index 98d9cbe600d489bc395e7dc6c6abb2ab9a725277..e484a5737e7cb9e65482403eeb884f6aa556b144 100644 (file)
--- a/src/pkg/net/sock_posix.go
+++ b/src/pkg/net/sock_posix.go
@@ -11,6 +11,16 @@ import (
        "time"
 )
 
+// A sockaddr represents a TCP, UDP, IP network endpoint address that
+// can be converted into a syscall.Sockaddr.
+type sockaddr interface {
+       Addr
+       family() int
+       isWildcard() bool
+       sockaddr(family int) (syscall.Sockaddr, error)
+       toAddr() sockaddr
+}
+
 // 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)