修复下载测速时间不准确、卡住的问题

XIU2 · Dec 24, 2020 · 638273b · 638273b
1 parent dc68529
commit 638273b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/main.go b/main.go
@@ -138,10 +138,6 @@ func main() {
 	var data_2 = make([]CloudflareIPData, 0)
 	downloadTestTime = time.Duration(downloadSecond) * time.Second
 
-	//println(downloadTestCount)
-	//println(downloadTestTime)
-	//println(downloadSecond)
-
 	fmt.Println("# XIU2/CloudflareSpeedTest " + version + "\n")
 	if ipv6Mode {
 		fmt.Println("开始延迟测速（模式：TCP IPv6，端口：" + strconv.Itoa(tcpPort) + "）：")

diff --git a/tcping.go b/tcping.go
@@ -112,7 +112,7 @@ func DownloadSpeedHandler(ip net.IPAddr) (bool, float32) {
 		Transport:     nil,
 		CheckRedirect: nil,
 		Jar:           nil,
-		Timeout:       0,
+		Timeout:       downloadTestTime,
 	}
 	var fullAddress string
 	if ipv6Mode { // IPv6 需要加上 []
@@ -124,7 +124,6 @@ func DownloadSpeedHandler(ip net.IPAddr) (bool, float32) {
 		DialContext: GetDialContextByAddr(fullAddress),
 	}
 	response, err := client.Get(url)
-
 	if err != nil {
 		return false, 0
 	} else {