diff --git a/README.md b/README.md index 1f74394..f6aa234 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 1. 下载编译好的可执行文件 [蓝奏云](https://www.lanzoux.com/b0742hkxe) / [Github](https://github.com/XIU2/CloudflareSpeedTest/releases) 并解压。 2. 双击运行 `CloudflareST.exe`文件(Windows系统),等待测速... -测速完毕后,会把结果保存在当前目录下的 `result.csv` 文件中,用记事本打开,排序为**延迟由低到高**,每一列用逗号分隔,分别是: +测速完毕后,会显示最快的 20 个 IP,完整结果则保存在当前目录下的 `result.csv` 文件中,用记事本打开,排序为**延迟由低到高**,每一列用逗号分隔,分别是: ``` IP 地址, 测试次数, 成功次数, 成功比率, 平均延迟, 下载速度 (MB/s) 104.27.70.18, 4, 4, 1.00, 150.79, 12.89 @@ -41,6 +41,8 @@ https://github.com/XIU2/CloudflareSpeedTest 测速线程数量;数值越大速度越快,请勿超过 1000(结果误差大);(默认 500) -t 4 延迟测速次数;单个 IP 测速次数,为 1 时将过滤丢包的IP,TCP协议;(默认 4) + -tp 443 + 延迟测速端口;延迟测速 TCP 协议的端口;(默认 443) -dn 20 下载测速数量;延迟测速并排序后,从最低延迟起下载测速数量,请勿太多(速度慢);(默认 20) -dt 10 @@ -59,9 +61,9 @@ https://github.com/XIU2/CloudflareSpeedTest 打印帮助说明 示例: - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p 20 - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "ip.txt" -o "result.csv" -dd - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "ip.txt" -o "result.csv" -dd + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd ``` #### 使用示例 @@ -71,19 +73,19 @@ https://github.com/XIU2/CloudflareSpeedTest ``` cmd # CMD 示例 -CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p 20 +CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 # 指定 IP数据文件 及 输出结果文件(相对路径,即当前目录下) -CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "ip.txt" -o "result.csv" -dd +CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "ip.txt" -o "result.csv" -dd # 指定 IP数据文件 及 输出结果文件(绝对路径,即 C:\abc\ 目录下) -CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd +CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd ``` ``` cmd # 快捷方式示例(右键快捷方式 - 目标) ## 如果有引号就放在引号外面,记得引号和 - 之间有空格。 -"D:\Program Files\CloudflareST\CloudflareST.exe" -n 500 -t 4 -dn 20 -dt 10 -p 20 +"D:\Program Files\CloudflareST\CloudflareST.exe" -n 500 -t 4 -dn 20 -dt 10 ``` **** diff --git a/main.go b/main.go index 61643ba..77cf4dd 100644 --- a/main.go +++ b/main.go @@ -5,6 +5,7 @@ import ( "fmt" "os" "sort" + "strconv" "sync" "time" @@ -13,6 +14,7 @@ import ( var version string var disableDownload bool +var tcpPort int var ipFile string var outputFile string var printResult int @@ -30,6 +32,8 @@ https://github.com/XIU2/CloudflareSpeedTest 测速线程数量;数值越大速度越快,请勿超过 1000(结果误差大);(默认 500) -t 4 延迟测速次数;单个 IP 测速次数,为 1 时将过滤丢包的IP,TCP协议;(默认 4) + -tp 443 + 延迟测速端口;延迟测速 TCP 协议的端口;(默认 443) -dn 20 下载测速数量;延迟测速并排序后,从最低延迟起下载测速数量,请勿太多(速度慢);(默认 20) -dt 10 @@ -48,12 +52,13 @@ https://github.com/XIU2/CloudflareSpeedTest 打印帮助说明 示例: - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p 20 - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "ip.txt" -o "result.csv" -dd - CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -p -1 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd` + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "ip.txt" -o "result.csv" -dd + CloudflareST.exe -n 500 -t 4 -dn 20 -dt 10 -f "C:\abc\ip.txt" -o "C:\abc\result.csv" -dd` flag.IntVar(&pingRoutine, "n", 500, "测速线程数量") flag.IntVar(&pingTime, "t", 4, "延迟测速次数") + flag.IntVar(&tcpPort, "tp", 443, "延迟测速端口") flag.IntVar(&downloadTestCount, "dn", 20, "下载测速数量") flag.Int64Var(&downloadSecond, "dt", 10, "下载测速时间") flag.IntVar(&printResult, "p", 20, "直接显示结果") @@ -76,6 +81,9 @@ https://github.com/XIU2/CloudflareSpeedTest if pingTime <= 0 { pingTime = 4 } + if tcpPort < 1 || tcpPort > 65535 { + tcpPort = 443 + } if downloadTestCount <= 0 { downloadTestCount = 20 } @@ -103,13 +111,13 @@ func main() { var mu sync.Mutex var data = make([]CloudflareIPData, 0) - fmt.Println("开始延迟测速(TCP):") + fmt.Println("开始延迟测速(模式:TCP,端口:" + strconv.Itoa(tcpPort) + "):") control := make(chan bool, pingRoutine) for _, ip := range ips { wg.Add(1) control <- false handleProgress := handleProgressGenerator(bar) // 多线程进度条 - go tcpingGoroutine(&wg, &mu, ip, pingTime, &data, control, handleProgress) + go tcpingGoroutine(&wg, &mu, ip, tcpPort, pingTime, &data, control, handleProgress) } wg.Wait() bar.Finish() diff --git a/tcping.go b/tcping.go index 5d86f2f..545a465 100644 --- a/tcping.go +++ b/tcping.go @@ -13,9 +13,9 @@ import ( ) //bool connectionSucceed float32 time -func tcping(ip net.IPAddr) (bool, float32) { +func tcping(ip net.IPAddr, tcpPort int) (bool, float32) { startTime := time.Now() - conn, err := net.DialTimeout("tcp", ip.String()+":"+strconv.Itoa(defaultTcpPort), tcpConnectTimeout) + conn, err := net.DialTimeout("tcp", ip.String()+":"+strconv.Itoa(tcpPort), tcpConnectTimeout) if err != nil { return false, 0 } else { @@ -27,11 +27,11 @@ func tcping(ip net.IPAddr) (bool, float32) { } //pingReceived pingTotalTime -func checkConnection(ip net.IPAddr) (int, float32) { +func checkConnection(ip net.IPAddr, tcpPort int) (int, float32) { pingRecv := 0 var pingTime float32 = 0.0 for i := 1; i <= failTime; i++ { - pingSucceed, pingTimeCurrent := tcping(ip) + pingSucceed, pingTimeCurrent := tcping(ip, tcpPort) if pingSucceed { pingRecv++ pingTime += pingTimeCurrent @@ -41,12 +41,12 @@ func checkConnection(ip net.IPAddr) (int, float32) { } //return Success packetRecv averagePingTime specificIPAddr -func tcpingHandler(ip net.IPAddr, pingCount int, progressHandler func(e progressEvent)) (bool, int, float32, net.IPAddr) { +func tcpingHandler(ip net.IPAddr, tcpPort int, pingCount int, progressHandler func(e progressEvent)) (bool, int, float32, net.IPAddr) { ipCanConnect := false pingRecv := 0 var pingTime float32 = 0.0 for !ipCanConnect { - pingRecvCurrent, pingTimeCurrent := checkConnection(ip) + pingRecvCurrent, pingTimeCurrent := checkConnection(ip, tcpPort) if pingRecvCurrent != 0 { ipCanConnect = true pingRecv = pingRecvCurrent @@ -62,7 +62,7 @@ func tcpingHandler(ip net.IPAddr, pingCount int, progressHandler func(e progress if ipCanConnect { progressHandler(AvailableIPFound) for i := failTime; i < pingCount; i++ { - pingSuccess, pingTimeCurrent := tcping(ip) + pingSuccess, pingTimeCurrent := tcping(ip, tcpPort) progressHandler(NormalPing) if pingSuccess { pingRecv++ @@ -76,9 +76,9 @@ func tcpingHandler(ip net.IPAddr, pingCount int, progressHandler func(e progress } } -func tcpingGoroutine(wg *sync.WaitGroup, mutex *sync.Mutex, ip net.IPAddr, pingCount int, csv *[]CloudflareIPData, control chan bool, progressHandler func(e progressEvent)) { +func tcpingGoroutine(wg *sync.WaitGroup, mutex *sync.Mutex, ip net.IPAddr, tcpPort int, pingCount int, csv *[]CloudflareIPData, control chan bool, progressHandler func(e progressEvent)) { defer wg.Done() - success, pingRecv, pingTimeAvg, currentIP := tcpingHandler(ip, pingCount, progressHandler) + success, pingRecv, pingTimeAvg, currentIP := tcpingHandler(ip, tcpPort, pingCount, progressHandler) if success { mutex.Lock() var cfdata CloudflareIPData diff --git a/util.go b/util.go index 82f9e24..368989d 100644 --- a/util.go +++ b/util.go @@ -81,7 +81,7 @@ const downloadBufferSize = 1024 var downloadTestCount int -const defaultTcpPort = 443 +//const defaultTcpPort = 443 const tcpConnectTimeout = time.Second * 1 var failTime int