tcjlj/flvx
1
0
Fork 0
mirror of https://github.com/Sagit-chu/flvx.git synced 2026-10-06 01:56:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复v6tcpping问题

Browse Source
This commit is contained in:
qaq
2025-07-22 20:40:58 +08:00
parent b3135d3b0f
commit 971f45eb42
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go-gost/gost
BIN
View File
Binary file not shown.
go-gost/x/socket/websocket_reporter.go
+10 -9
View File
@@ -67,7 +67,7 @@ type TcpPingRequest struct {
IP string `json:"ip"` IP string `json:"ip"`
Port int `json:"port"` Port int `json:"port"`
Count int `json:"count"` Count int `json:"count"`
Timeout int `json:"timeout"` // 超时时间(毫秒) Timeout int `json:"timeout"` // 超时时间(毫秒)
RequestId string `json:"requestId,omitempty"` RequestId string `json:"requestId,omitempty"`
} }
@@ -1011,20 +1011,23 @@ func (w *WebSocketReporter) handleTcpPing(data interface{}) (TcpPingResponse, er
func tcpPingHost(ip string, port int, count int, timeoutMs int) (float64, float64, error) { func tcpPingHost(ip string, port int, count int, timeoutMs int) (float64, float64, error) {
var totalTime float64 var totalTime float64
var successCount int var successCount int
timeout := time.Duration(timeoutMs) * time.Millisecond timeout := time.Duration(timeoutMs) * time.Millisecond
target := fmt.Sprintf("%s:%d", ip, port)
// 使用net.JoinHostPort来正确处理IPv4、IPv6和域名
// 它会自动为IPv6地址添加方括号
target := net.JoinHostPort(ip, fmt.Sprintf("%d", port))
fmt.Printf("🔍 开始TCP ping测试: %s，次数: %d，超时: %dms\n", target, count, timeoutMs) fmt.Printf("🔍 开始TCP ping测试: %s，次数: %d，超时: %dms\n", target, count, timeoutMs)
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
start := time.Now() start := time.Now()
// 创建带超时的TCP连接 // 创建带超时的TCP连接
conn, err := net.DialTimeout("tcp", target, timeout) conn, err := net.DialTimeout("tcp", target, timeout)
elapsed := time.Since(start) elapsed := time.Since(start)
if err != nil { if err != nil {
fmt.Printf(" 第%d次连接失败: %v (%.2fms)\n", i+1, err, elapsed.Seconds()*1000) fmt.Printf(" 第%d次连接失败: %v (%.2fms)\n", i+1, err, elapsed.Seconds()*1000)
} else { } else {
@@ -1033,7 +1036,7 @@ func tcpPingHost(ip string, port int, count int, timeoutMs int) (float64, float6
totalTime += elapsed.Seconds() * 1000 // 转换为毫秒 totalTime += elapsed.Seconds() * 1000 // 转换为毫秒
successCount++ successCount++
} }
// 如果不是最后一次，等待一下再进行下次测试 // 如果不是最后一次，等待一下再进行下次测试
if i < count-1 { if i < count-1 {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
@@ -1052,8 +1055,6 @@ func tcpPingHost(ip string, port int, count int, timeoutMs int) (float64, float6
return avgTime, packetLoss, nil return avgTime, packetLoss, nil
} }
// isValidHostname 验证主机名格式 // isValidHostname 验证主机名格式
func isValidHostname(hostname string) bool { func isValidHostname(hostname string) bool {
if len(hostname) == 0 || len(hostname) > 253 { if len(hostname) == 0 || len(hostname) > 253 {