From 638273b7e7d02f8a7db31141eba56fd2d325041f Mon Sep 17 00:00:00 2001 From: xiu2 <54703944+XIU2@users.noreply.github.com> Date: Thu, 24 Dec 2020 23:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=B5=8B=E9=80=9F=E6=97=B6=E9=97=B4=E4=B8=8D=E5=87=86=E7=A1=AE?= =?UTF-8?q?=E3=80=81=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 4 ---- tcping.go | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/main.go b/main.go index f11ac8e..fe95c0b 100644 --- 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 index f941abf..8d37e53 100644 --- 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 {