refactor SCTPAddr.String

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
ishidawataru · Feb 7, 2018 · 7541982 · 7541982
1 parent 70267b2
commit 7541982
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/sctp.go b/sctp.go
@@ -239,22 +239,19 @@ func (a *SCTPAddr) String() string {
 
  for n, i := range a.IP {
  if a.IP[n].To4() != nil {
- b.WriteRune('/')
  b.WriteString(i.String())
  } else if a.IP[n].To16() != nil {
- b.WriteRune('/')
  b.WriteRune('[')
  b.WriteString(i.String())
  b.WriteRune(']')
  }
- }
- if len(a.IP) == 0 {
- b.WriteRune('/')
+  if n < len(a.IP)-1 {
+  b.WriteRune('/')
+ }
  }
  b.WriteRune(':')
  b.WriteString(strconv.Itoa(a.Port))
-
- return b.String()[1:]
+ return b.String()
 }
 
 func (a *SCTPAddr) Network() string { return "sctp" }

diff --git a/sctp_test.go b/sctp_test.go
@@ -30,6 +30,15 @@ var resolveSCTPAddrTests = []resolveSCTPAddrTest{
  {"sctp4", "127.0.0.1/10.0.0.1:65535", &SCTPAddr{IP: []net.IP{net.IPv4(127, 0, 0, 1), net.IPv4(10, 0, 0, 1)}, Port: 65535}, nil},
 }
 
+func TestSCTPAddrString(t *testing.T) {
+ for _, tt := range resolveSCTPAddrTests {
+ s := tt.addr.String()
+ if tt.litAddrOrName != s {
+ t.Errorf("expected %q, got %q", tt.litAddrOrName, s)
+ }
+ }
+}
+
 func TestResolveSCTPAddr(t *testing.T) {
  for _, tt := range resolveSCTPAddrTests {
  addr, err := ResolveSCTPAddr(tt.network, tt.litAddrOrName)