qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 19:17:57 -07:00
Code Releases Activity

net: make use of IPv4len, IPv6len

Browse Source 
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4926046
This commit is contained in:
Mikio Hara 2011-08-24 13:59:33 -04:00 committed by Russ Cox
parent 6ecd5f9fe7
commit 80f79ad305
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/net/dnsclient_unix.go
View File

@ -113,7 +113,7 @@ func convertRR_A(records []dnsRR) []IP {
func convertRR_AAAA(records []dnsRR) []IP { func convertRR_AAAA(records []dnsRR) []IP {
addrs := make([]IP, len(records)) addrs := make([]IP, len(records))
for i, rr := range records { for i, rr := range records {
a := make(IP, 16) a := make(IP, IPv6len)
copy(a, rr.(*dnsRR_AAAA).AAAA[:]) copy(a, rr.(*dnsRR_AAAA).AAAA[:])
addrs[i] = a addrs[i] = a
} }

4
src/pkg/net/iprawsock_posix.go
View File

@ -25,7 +25,7 @@ func sockaddrToIP(sa syscall.Sockaddr) Addr {
} }
func (a *IPAddr) family() int { func (a *IPAddr) family() int {
if a == nil || len(a.IP) <= 4 { if a == nil || len(a.IP) <= IPv4len {
return syscall.AF_INET return syscall.AF_INET
} }
if a.IP.To4() != nil { 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) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
addr = &IPAddr{sa.Addr[0:]} 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 hsize := (int(b[0]) & 0xf) * 4
copy(b, b[hsize:]) copy(b, b[hsize:])
n -= hsize n -= hsize

2
src/pkg/net/tcpsock_posix.go
View File

@ -23,7 +23,7 @@ func sockaddrToTCP(sa syscall.Sockaddr) Addr {
} }
func (a *TCPAddr) family() int { func (a *TCPAddr) family() int {
if a == nil || len(a.IP) <= 4 { if a == nil || len(a.IP) <= IPv4len {
return syscall.AF_INET return syscall.AF_INET
} }
if a.IP.To4() != nil { if a.IP.To4() != nil {

2
src/pkg/net/udpsock_posix.go
View File

@ -23,7 +23,7 @@ func sockaddrToUDP(sa syscall.Sockaddr) Addr {
} }
func (a *UDPAddr) family() int { func (a *UDPAddr) family() int {
if a == nil || len(a.IP) <= 4 { if a == nil || len(a.IP) <= IPv4len {
return syscall.AF_INET return syscall.AF_INET
} }
if a.IP.To4() != nil { if a.IP.To4() != nil {