diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-10-23 04:31:11 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-10-23 04:31:11 +0000 |
| commit | 4ccad563d2a3559f0557bfb177bcf45144219bdf (patch) | |
| tree | 46bb86f514fbf6bad82da48e69a18fb09d878834 /libgo/go/net/ipsock_posix.go | |
| parent | 0b7463235f0e23c624d1911c9b15f531108cc5a6 (diff) | |
libgo: Update to current sources.
From-SVN: r192704
Diffstat (limited to 'libgo/go/net/ipsock_posix.go')
| -rw-r--r-- | libgo/go/net/ipsock_posix.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgo/go/net/ipsock_posix.go b/libgo/go/net/ipsock_posix.go index ed313195c97..171889207d7 100644 --- a/libgo/go/net/ipsock_posix.go +++ b/libgo/go/net/ipsock_posix.go @@ -97,10 +97,13 @@ func favoriteAddrFamily(net string, laddr, raddr sockaddr, mode string) (family return syscall.AF_INET6, true } - if mode == "listen" && laddr.isWildcard() { + if mode == "listen" && (laddr == nil || laddr.isWildcard()) { if supportsIPv4map { return syscall.AF_INET6, false } + if laddr == nil { + return syscall.AF_INET, false + } return laddr.family(), false } |