diff options
| author | Russ Cox <rsc@golang.org> | 2009-05-07 10:31:48 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-05-07 10:31:48 -0700 |
| commit | c836acdeb6033fe96fa7c2fe6e290817a2256c26 (patch) | |
| tree | 9850b587c6ccde87d493b0bdb1f42c6d30e89da2 /src/lib/net/net.go | |
| parent | 6c5d53ca44c96df1825d8ab9c5cd4382afcf8e8b (diff) | |
| download | golang-c836acdeb6033fe96fa7c2fe6e290817a2256c26.tar.gz | |
next step for 6.out on Borg: fix and test
net code on IPv4-only machines.
R=r
DELTA=27 (25 added, 0 deleted, 2 changed)
OCL=28404
CL=28411
Diffstat (limited to 'src/lib/net/net.go')
| -rw-r--r-- | src/lib/net/net.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/net/net.go b/src/lib/net/net.go index 63074470b..b4bb48b24 100644 --- a/src/lib/net/net.go +++ b/src/lib/net/net.go @@ -345,7 +345,7 @@ func internetSocket(net, laddr, raddr string, proto int64, mode string) default: // Otherwise, guess. // If the addresses are IPv4 and we prefer IPv4, use 4; else 6. - if preferIPv4 && lip.To4() != nil && rip.To4() != nil { + if preferIPv4 && (lip == nil || lip.To4() != nil) && (rip == nil || rip.To4() != nil) { vers = 4 } else { vers = 6 |