Commit c0a4ce52 authored by Mikio Hara's avatar Mikio Hara

net: simplify probeIPv6Stack

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/11807043
parent 085159da
...@@ -28,8 +28,8 @@ import ( ...@@ -28,8 +28,8 @@ import (
// boolean value is true, kernel supports IPv6 IPv4-mapping. // boolean value is true, kernel supports IPv6 IPv4-mapping.
func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) { func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
var probes = []struct { var probes = []struct {
la TCPAddr laddr TCPAddr
ok bool ok bool
}{ }{
// IPv6 communication capability // IPv6 communication capability
{TCPAddr{IP: ParseIP("::1")}, false}, {TCPAddr{IP: ParseIP("::1")}, false},
...@@ -44,12 +44,11 @@ func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) { ...@@ -44,12 +44,11 @@ func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
} }
defer closesocket(s) defer closesocket(s)
syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0) 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 { if err != nil {
continue continue
} }
err = syscall.Bind(s, sa) if err := syscall.Bind(s, sa); err != nil {
if err != nil {
continue continue
} }
probes[i].ok = true probes[i].ok = true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment