diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2015-07-07 12:10:15 +0900 |
|---|---|---|
| committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2015-07-10 06:51:55 +0000 |
| commit | 7b5d536786a1cb03e017dffc6dc693b55c1ddb0d (patch) | |
| tree | c9a022a22d6da2a803353e163605a339c2da6613 /src | |
| parent | a625b919163e76c391f2865d1f956c0f16d90f83 (diff) | |
| download | go-7b5d536786a1cb03e017dffc6dc693b55c1ddb0d.tar.xz | |
net: ensure that ResolveIPAddr(addr.String()) reproduces addr
Updates #6465.
Change-Id: I5babbcf4c92dae47c823a41628b01e4ceb2332eb
Reviewed-on: https://go-review.googlesource.com/11951
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/ipraw_test.go | 2 | ||||
| -rw-r--r-- | src/net/iprawsock.go | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/net/ipraw_test.go b/src/net/ipraw_test.go index 7221f7868b..5d86a9d031 100644 --- a/src/net/ipraw_test.go +++ b/src/net/ipraw_test.go @@ -38,6 +38,8 @@ var resolveIPAddrTests = []resolveIPAddrTest{ {"", "127.0.0.1", &IPAddr{IP: IPv4(127, 0, 0, 1)}, nil}, // Go 1.0 behavior {"", "::1", &IPAddr{IP: ParseIP("::1")}, nil}, // Go 1.0 behavior + {"ip4:icmp", "", &IPAddr{}, nil}, + {"l2tp", "127.0.0.1", nil, UnknownNetworkError("l2tp")}, {"l2tp:gre", "127.0.0.1", nil, UnknownNetworkError("l2tp:gre")}, {"tcp", "1.2.3.4:123", nil, UnknownNetworkError("tcp")}, diff --git a/src/net/iprawsock.go b/src/net/iprawsock.go index 71d1fc1fc2..f02df7fa8d 100644 --- a/src/net/iprawsock.go +++ b/src/net/iprawsock.go @@ -17,10 +17,11 @@ func (a *IPAddr) String() string { if a == nil { return "<nil>" } + ip := ipEmptyString(a.IP) if a.Zone != "" { - return a.IP.String() + "%" + a.Zone + return ip + "%" + a.Zone } - return a.IP.String() + return ip } func (a *IPAddr) isWildcard() bool { |