net: make use of IPv4len, IPv6len

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

diff --git a/src/pkg/net/dnsclient_unix.go b/src/pkg/net/dnsclient_unix.go
index f407b1778304240b7241e5e3b605dcd5bb013306..cb46455091c50f962bfa2a0ff3411e3a7e636b9e 100644 (file)
--- a/src/pkg/net/dnsclient_unix.go
+++ b/src/pkg/net/dnsclient_unix.go
@@ -113,7 +113,7 @@ func convertRR_A(records []dnsRR) []IP {
 func convertRR_AAAA(records []dnsRR) []IP {
        addrs := make([]IP, len(records))
        for i, rr := range records {
-               a := make(IP, 16)
+               a := make(IP, IPv6len)
                copy(a, rr.(*dnsRR_AAAA).AAAA[:])
                addrs[i] = a
        }

diff --git a/src/pkg/net/iprawsock_posix.go b/src/pkg/net/iprawsock_posix.go
index 4e115180061c4751c8b88748296f5bd128be1560..5cbc5887024f70c9c02656a0175d3a1ec53cd08c 100644 (file)
--- a/src/pkg/net/iprawsock_posix.go
+++ b/src/pkg/net/iprawsock_posix.go
@@ -25,7 +25,7 @@ func sockaddrToIP(sa syscall.Sockaddr) Addr {
 }
 
 func (a *IPAddr) family() int {
-       if a == nil || len(a.IP) <= 4 {
+       if a == nil || len(a.IP) <= IPv4len {
                return syscall.AF_INET
        }
        if a.IP.To4() != nil {
@@ -158,7 +158,7 @@ func (c *IPConn) ReadFromIP(b []byte) (n int, addr *IPAddr, err os.Error) {
        switch sa := sa.(type) {
        case *syscall.SockaddrInet4:
                addr = &IPAddr{sa.Addr[0:]}
-               if len(b) >= 4 { // discard ipv4 header
+               if len(b) >= IPv4len { // discard ipv4 header
                        hsize := (int(b[0]) & 0xf) * 4
                        copy(b, b[hsize:])
                        n -= hsize

diff --git a/src/pkg/net/tcpsock_posix.go b/src/pkg/net/tcpsock_posix.go
index 5560301b40f0f05a0f10ad93acfc85eea53ed665..f01c380c464c889e16eee2f9b42d0c3ecb1c6bf3 100644 (file)
--- a/src/pkg/net/tcpsock_posix.go
+++ b/src/pkg/net/tcpsock_posix.go
@@ -23,7 +23,7 @@ func sockaddrToTCP(sa syscall.Sockaddr) Addr {
 }
 
 func (a *TCPAddr) family() int {
-       if a == nil || len(a.IP) <= 4 {
+       if a == nil || len(a.IP) <= IPv4len {
                return syscall.AF_INET
        }
        if a.IP.To4() != nil {

diff --git a/src/pkg/net/udpsock_posix.go b/src/pkg/net/udpsock_posix.go
index dfda997946365fc090b626792b31cb964e69f0ea..1dc79f736a810850f9f0197fc03c8237502e9ce4 100644 (file)
--- a/src/pkg/net/udpsock_posix.go
+++ b/src/pkg/net/udpsock_posix.go
@@ -23,7 +23,7 @@ func sockaddrToUDP(sa syscall.Sockaddr) Addr {
 }
 
 func (a *UDPAddr) family() int {
-       if a == nil || len(a.IP) <= 4 {
+       if a == nil || len(a.IP) <= IPv4len {
                return syscall.AF_INET
        }
        if a.IP.To4() != nil {