diff options
| author | Michael Stapelberg <michael@stapelberg.de> | 2013-03-23 11:28:53 +0100 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-03-23 11:28:53 +0100 |
| commit | b39e15dde5ec7b96c15da9faf4ab5892501c1aae (patch) | |
| tree | 718cede1f6ca97d082c6c40b7dc3f4f6148253c0 /src/pkg/net/iprawsock.go | |
| parent | 04b08da9af0c450d645ab7389d1467308cfc2db8 (diff) | |
| download | golang-upstream/1.1_hg20130323.tar.gz | |
Imported Upstream version 1.1~hg20130323upstream/1.1_hg20130323
Diffstat (limited to 'src/pkg/net/iprawsock.go')
| -rw-r--r-- | src/pkg/net/iprawsock.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pkg/net/iprawsock.go b/src/pkg/net/iprawsock.go index daccba366..9d99e7591 100644 --- a/src/pkg/net/iprawsock.go +++ b/src/pkg/net/iprawsock.go @@ -19,12 +19,15 @@ func (a *IPAddr) String() string { if a == nil { return "<nil>" } + if a.Zone != "" { + return a.IP.String() + "%" + a.Zone + } return a.IP.String() } -// ResolveIPAddr parses addr as an IP address and resolves domain -// names to numeric addresses on the network net, which must be -// "ip", "ip4" or "ip6". +// ResolveIPAddr parses addr as an IP address of the form "host" or +// "ipv6-host%zone" and resolves the domain name on the network net, +// which must be "ip", "ip4" or "ip6". func ResolveIPAddr(net, addr string) (*IPAddr, error) { if net == "" { // a hint wildcard for Go 1.0 undocumented behavior net = "ip" |