qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 16:18:35 -06:00
Code Releases Activity

net: simplify probeIPv6Stack

Browse Source 
R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/11807043
This commit is contained in:
Mikio Hara 2013-07-25 19:29:20 +09:00
parent 085159da26
commit c0a4ce52c6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pkg/net/ipsock_posix.go
View File

@ -28,8 +28,8 @@ import (
// boolean value is true, kernel supports IPv6 IPv4-mapping.
func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
var probes = []struct {
la TCPAddr
ok bool
laddr TCPAddr
ok bool
}{
// IPv6 communication capability
{TCPAddr{IP: ParseIP("::1")}, false},
@ -44,12 +44,11 @@ func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
}
defer closesocket(s)
syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0)
sa, err := probes[i].la.toAddr().sockaddr(syscall.AF_INET6)
sa, err := probes[i].laddr.sockaddr(syscall.AF_INET6)
if err != nil {
continue
}
err = syscall.Bind(s, sa)
if err != nil {
if err := syscall.Bind(s, sa); err != nil {
continue
}
probes[i].ok = true