增加tcping的兼容性处理代码
This commit is contained in:
@ -22,7 +22,14 @@ func TestTcping(t *testing.T) {
|
|||||||
|
|
||||||
ip6res := utils.Tcping(localhost6, 9999)
|
ip6res := utils.Tcping(localhost6, 9999)
|
||||||
assert.Equal(t, true, ip6res)
|
assert.Equal(t, true, ip6res)
|
||||||
|
|
||||||
|
ip4resWithBracket := utils.Tcping("["+localhost4+"]", 9999)
|
||||||
|
assert.Equal(t, true, ip4resWithBracket)
|
||||||
|
|
||||||
|
ip6resWithBracket := utils.Tcping("["+localhost6+"]", 9999)
|
||||||
|
assert.Equal(t, true, ip6resWithBracket)
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
conn.Close()
|
_ = conn.Close()
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
@ -83,15 +83,22 @@ func UUID() string {
|
|||||||
|
|
||||||
func Tcping(ip string, port int) bool {
|
func Tcping(ip string, port int) bool {
|
||||||
var (
|
var (
|
||||||
conn net.Conn
|
conn net.Conn
|
||||||
err error
|
err error
|
||||||
|
address string
|
||||||
)
|
)
|
||||||
strPort := strconv.Itoa(port)
|
strPort := strconv.Itoa(port)
|
||||||
if conn, err = net.DialTimeout("tcp", fmt.Sprintf("[%s]:%s", ip, strPort), 2*time.Second); err != nil {
|
if strings.HasPrefix(ip, "[") && strings.HasSuffix(ip, "]") {
|
||||||
|
// 如果用户有填写中括号就不再拼接
|
||||||
|
address = fmt.Sprintf("%s:%s", ip, strPort)
|
||||||
|
} else {
|
||||||
|
address = fmt.Sprintf("[%s]:%s", ip, strPort)
|
||||||
|
}
|
||||||
|
if conn, err = net.DialTimeout("tcp", address, 2*time.Second); err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
conn.Close()
|
_ = conn.Close()
|
||||||
}()
|
}()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user