lili/CloudflareSpeedTest
1
0
Fork 0
mirror of https://github.com/XIU2/CloudflareSpeedTest.git synced 2026-03-06 22:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增 支持 IPv4 与 IPv6 混合测速; 移除 -ipv6 参数(已无用)

Browse Source
This commit is contained in:
xiu2
2022-11-08 15:47:19 +08:00
parent ce22f6b2a4
commit 021914f975
6 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
task/download.go
View File

@@ -91,9 +91,11 @@ func TestDownloadSpeed(ipSet utils.PingDelaySet) (speedSet utils.DownloadSpeedSe
}
func getDialContext(ip *net.IPAddr) func(ctx context.Context, network, address string) (net.Conn, error) {
fakeSourceAddr := ip.String() + ":" + fmt.Sprintf("%d", TCPPort)
if IPv6 { // IPv6 需要加上 []
fakeSourceAddr = "[" + ip.String() + "]:" + fmt.Sprintf("%d", TCPPort)
var fakeSourceAddr string
if isIPv4(ip.String()) {
fakeSourceAddr = fmt.Sprintf("%s:%d", ip.String(), TCPPort)
} else {
fakeSourceAddr = fmt.Sprintf("[%s]:%d", ip.String(), TCPPort)
}
return func(ctx context.Context, network, address string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, network, fakeSourceAddr)

19
task/ip.go
View File

@@ -14,8 +14,6 @@ import (
const defaultInputFile = "ip.txt"
var (
// IPv6 IP version is 6
IPv6 = false
// TestAll test all ip
TestAll = false
// IPFile is the filename of IP Rangs
@@ -26,6 +24,10 @@ func InitRandSeed() {
rand.Seed(time.Now().UnixNano())
}
func isIPv4(ip string) bool {
return strings.Contains(ip, ".")
}
func randIPEndWith(num byte) byte {
if num == 0 { // 对于 /32 这种单独的 IP
return byte(0)
@@ -49,8 +51,9 @@ func newIPRanges() *IPRanges {
func (r *IPRanges) fixIP(ip string) string {
// 如果不含有 '/' 则代表不是 IP 段，而是一个单独的 IP，因此需要加上 /32 /128 子网掩码
if i := strings.IndexByte(ip, '/'); i < 0 {
r.mask = "/32"
if IPv6 {
if isIPv4(ip) {
r.mask = "/32"
} else {
r.mask = "/128"
}
ip += r.mask
@@ -116,8 +119,6 @@ func (r *IPRanges) chooseIPv4() {
func (r *IPRanges) chooseIPv6() {
var tempIP uint8
for r.ipNet.Contains(r.firstIP) {
//fmt.Println(firstIP)
//fmt.Println(firstIP[0], firstIP[1], firstIP[2], firstIP[3], firstIP[4], firstIP[5], firstIP[6], firstIP[7], firstIP[8], firstIP[9], firstIP[10], firstIP[11], firstIP[12], firstIP[13], firstIP[14], firstIP[15])
if r.mask != "/128" {
r.firstIP[15] = randIPEndWith(255) // 随机 IP 的最后一段
r.firstIP[14] = randIPEndWith(255) // 随机 IP 的最后一段
@@ -148,11 +149,11 @@ func loadIPRanges() []*net.IPAddr {
scanner := bufio.NewScanner(file)
for scanner.Scan() {
ranges.parseCIDR(scanner.Text())
if IPv6 {
if isIPv4(scanner.Text()) {
ranges.chooseIPv4()
} else {
ranges.chooseIPv6()
continue
}
ranges.chooseIPv4()
}
return ranges.ips
}

13
task/tcping.go
View File

@@ -62,11 +62,7 @@ func (p *Ping) Run() utils.PingDelaySet {
if len(p.ips) == 0 {
return p.csv
}
ipVersion := "IPv4"
if IPv6 { // IPv6 模式判断
ipVersion = "IPv6"
}
fmt.Printf("开始延迟测速（模式：TCP %s，端口：%d，平均延迟上限：%v ms，平均延迟下限：%v ms)\n", ipVersion, TCPPort, utils.InputMaxDelay.Milliseconds(), utils.InputMinDelay.Milliseconds())
fmt.Printf("开始延迟测速（模式：TCP，端口：%d，平均延迟上限：%v ms，平均延迟下限：%v ms)\n", TCPPort, utils.InputMaxDelay.Milliseconds(), utils.InputMinDelay.Milliseconds())
for _, ip := range p.ips {
p.wg.Add(1)
p.control <- false
@@ -87,9 +83,10 @@ func (p *Ping) start(ip *net.IPAddr) {
//bool connectionSucceed float32 time
func (p *Ping) tcping(ip *net.IPAddr) (bool, time.Duration) {
startTime := time.Now()
fullAddress := fmt.Sprintf("%s:%d", ip.String(), TCPPort)
//fmt.Println(ip.String())
if IPv6 { // IPv6 需要加上 []
var fullAddress string
if isIPv4(ip.String()) {
fullAddress = fmt.Sprintf("%s:%d", ip.String(), TCPPort)
} else {
fullAddress = fmt.Sprintf("[%s]:%d", ip.String(), TCPPort)
}
conn, err := net.DialTimeout("tcp", fullAddress, tcpConnectTimeout)