diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-11-21 07:03:38 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-11-21 07:03:38 +0000 |
| commit | fabcaa8df3d6eb852b87821ef090d31d222870b7 (patch) | |
| tree | 72455aea0286937aa08cc141e5efc800e4626577 /libgo/go/net/tcpsock.go | |
| parent | a51fb17f48428e7cfc96a72a9f9f87901363bb6b (diff) | |
| download | gcc-fabcaa8df3d6eb852b87821ef090d31d222870b7.zip gcc-fabcaa8df3d6eb852b87821ef090d31d222870b7.tar.gz gcc-fabcaa8df3d6eb852b87821ef090d31d222870b7.tar.bz2 | |
libgo: Update to current version of master library.
From-SVN: r193688
Diffstat (limited to 'libgo/go/net/tcpsock.go')
| -rw-r--r-- | libgo/go/net/tcpsock.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libgo/go/net/tcpsock.go b/libgo/go/net/tcpsock.go index 47fbf29..6aba1f8 100644 --- a/libgo/go/net/tcpsock.go +++ b/libgo/go/net/tcpsock.go @@ -6,6 +6,8 @@ package net +import "time" + // TCPAddr represents the address of a TCP end point. type TCPAddr struct { IP IP @@ -28,7 +30,11 @@ func (a *TCPAddr) String() string { // "tcp4" or "tcp6". A literal IPv6 host address must be // enclosed in square brackets, as in "[::]:80". func ResolveTCPAddr(net, addr string) (*TCPAddr, error) { - ip, port, err := hostPortToIP(net, addr) + return resolveTCPAddr(net, addr, noDeadline) +} + +func resolveTCPAddr(net, addr string, deadline time.Time) (*TCPAddr, error) { + ip, port, err := hostPortToIP(net, addr, deadline) if err != nil { return nil, err } |