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>

diff --git a/src/net/ipraw_test.go b/src/net/ipraw_test.go
index 7221f7868b97d95d6336479ea28acff6a4e00853..5d86a9d031610e32cd86d411f2d4b9b0795ba3e8 100644 (file)
--- 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 71d1fc1fc29363556fa25502a7dde980df990579..f02df7fa8d1527e43428475163278c8956191a88 100644 (file)
--- 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 {