support ipv6

Author: lxfeng1997

pkg/remoting/getty/session_manager.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"net"
 	"reflect"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -76,7 +77,7 @@ func (g *SessionManager) init() {
 	}
 	for _, address := range addressList {
 		gettyClient := getty.NewTCPClient(
-			getty.WithServerAddress(fmt.Sprintf("%s:%d", address.Addr, address.Port)),
+			getty.WithServerAddress(net.JoinHostPort(address.Addr, strconv.Itoa(address.Port))),
 			// todo if read c.gettyConf.ConnectionNum, will cause the connect to fail
 			getty.WithConnectionNumber(1),
 			getty.WithReconnectInterval(g.gettyConf.ReconnectInterval),

pkg/util/net/address_validator.go

@@ -19,37 +19,18 @@ package net
 
 import (
 	"fmt"
-	"regexp"
+	"net"
 	"strconv"
-	"strings"
 )
 
-const (
-	addressSplitChar = ":"
-)
-
-// Analyze it yourself here, in order to support the diversity of configurations
 func SplitIPPortStr(addr string) (string, int, error) {
 	if addr == "" {
 		return "", 0, fmt.Errorf("split ip err: param addr must not empty")
 	}
 
-	if addr[0] == '[' {
-		reg := regexp.MustCompile("[\\[\\]]")
-		addr = reg.ReplaceAllString(addr, "")
-	}
-
-	i := strings.LastIndex(addr, addressSplitChar)
-	if i < 0 {
-		return "", 0, fmt.Errorf("address %s: missing port in address", addr)
-	}
-
-	host := addr[:i]
-	port := addr[i+1:]
-
-	if strings.Contains(host, "%") {
-		reg := regexp.MustCompile("\\%[0-9]+")
-		host = reg.ReplaceAllString(host, "")
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return "", 0, err
 	}
 
 	portInt, err := strconv.Atoi(port)

pkg/util/net/address_validator_test.go

@@ -75,17 +75,15 @@ func TestAddressValidator(t *testing.T) {
 			name:    "endpoint is ipv6",
 			address: "[2000:0000:0000:0000:0001:2345:6789:abcd%10]:8080",
 			want: &IPAddr{
-				"2000:0000:0000:0000:0001:2345:6789:abcd", 8080,
+				"2000:0000:0000:0000:0001:2345:6789:abcd%10", 8080,
 			},
 			wantErr: false,
 		},
 		{
-			name:    "endpoint is ipv6",
-			address: "2000:0000:0000:0000:0001:2345:6789:abcd:8080",
-			want: &IPAddr{
-				"2000:0000:0000:0000:0001:2345:6789:abcd", 8080,
-			},
-			wantErr: false,
+			name:       "endpoint is ipv6",
+			address:    "2000:0000:0000:0000:0001:2345:6789:abcd:8080",
+			wantErr:    true,
+			wantErrMsg: "address 2000:0000:0000:0000:0001:2345:6789:abcd:8080: too many colons in address",
 		},
 		{
 			name:    "endpoint is ipv6",
@@ -97,7 +95,7 @@ func TestAddressValidator(t *testing.T) {
 		},
 		{
 			name:    "endpoint is ipv6",
-			address: "::FFFF:192.168.1.2:8080",
+			address: "[::FFFF:192.168.1.2]:8080",
 			want: &IPAddr{
 				"::FFFF:192.168.1.2", 8080,
 			},
@@ -114,7 +112,9 @@ func TestAddressValidator(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			//host, port, err := SplitIPPortStr(tt.address)
 			host, port, err := SplitIPPortStr(tt.address)
+
 			if (err != nil) != tt.wantErr {
 				t.Errorf("SplitIPPortStr() error = %v, wantErr = %v", err, tt.wantErr)
 			}