qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 08:07:57 -07:00
Code Releases Activity

net: make IPv6 String method standards compliant

Browse Source 
draft-ietf-6man-text-addr-representation-07 will introduce
a canonical textual representation format for IPv6 address.

R=rsc
CC=golang-dev
https://golang.org/cl/1856047
This commit is contained in:
Mikio Hara 2010-08-12 00:03:01 -07:00 committed by Russ Cox
parent d31ee536e8
commit e41987c821
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/net/ip.go
View File

@ -222,6 +222,11 @@ func (ip IP) String() string {
e1 = j e1 = j
} }
} }
// The symbol "::" MUST NOT be used to shorten just one 16 bit 0 field.
if e1-e0 <= 2 {
e0 = -1
e1 = -1
}
// Print with possible :: in place of run of zeros // Print with possible :: in place of run of zeros
var s string var s string

43
src/pkg/net/ip_test.go
View File

@ -50,3 +50,46 @@ func TestParseIP(t *testing.T) {
} }
} }
} }
type ipStringTest struct {
in IP
out string
}
var ipstringtests = []ipStringTest{
// cf. draft-ietf-6man-text-addr-representation-07
// (A Recommendation for IPv6 Address Text Representation)
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0,
0, 0, 0x1, 0x23, 0, 0x12, 0, 0x1},
"2001:db8::123:12:1"},
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x1},
"2001:db8::1"},
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0x1,
0, 0, 0, 0x1, 0, 0, 0, 0x1},
"2001:db8:0:1:0:1:0:1"},
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0x1, 0, 0,
0, 0x1, 0, 0, 0, 0x1, 0, 0},
"2001:db8:1:0:1:0:1:0"},
ipStringTest{IP{0x20, 0x1, 0, 0, 0, 0, 0, 0,
0, 0x1, 0, 0, 0, 0, 0, 0x1},
"2001::1:0:0:1"},
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0,
0, 0x1, 0, 0, 0, 0, 0, 0},
"2001:db8:0:0:1::"},
ipStringTest{IP{0x20, 0x1, 0xd, 0xb8, 0, 0, 0, 0,
0, 0x1, 0, 0, 0, 0, 0, 0x1},
"2001:db8::1:0:0:1"},
ipStringTest{IP{0x20, 0x1, 0xD, 0xB8, 0, 0, 0, 0,
0, 0xA, 0, 0xB, 0, 0xC, 0, 0xD},
"2001:db8::a:b:c:d"},
}
func TestIPString(t *testing.T) {
for i := 0; i < len(ipstringtests); i++ {
tt := ipstringtests[i]
if out := tt.in.String(); out != tt.out {
t.Errorf("IP.String(%v) = %#q, want %#q", tt.in, out, tt.out)
}
}
}