rebuild ip and rm old file

2026-03-16 20:15:59 +08:00 · 2021-11-10 23:58:40 +08:00
parent 28d5d89e85
commit 48012f513a
7 changed files with 91 additions and 421 deletions
--- a/task/download.go
+++ b/task/download.go
@@ -18,8 +18,8 @@ const (
 	bufferSize                     = 1024
 	defaultURL                     = "https://cf.xiu2.xyz/Github/CloudflareSpeedTest.png"
 	defaultTimeout                 = 10 * time.Second
-	defaultDisableDownlaod         = false
-	defaultTestNum                 = 20
+	defaultDisableDownload         = false
+	defaultTestNum                 = 10
 	defaultMinSpeed        float64 = 0.0
 )

@@ -29,7 +29,7 @@ var (
 	// download timeout
 	Timeout = defaultTimeout
 	// disable download
-	Disable = defaultDisableDownlaod
+	Disable = defaultDisableDownload

 	TestCount = defaultTestNum
 	MinSpeed  = defaultMinSpeed
--- a/task/ip.go
+++ b/task/ip.go
@@ -27,7 +27,7 @@ func randipEndWith(num int) uint8 {
 	return uint8(rand.Intn(num))
 }

-func LoadIPRanges() []*net.IPAddr {
+func loadIPRanges() []*net.IPAddr {
 	if IPFile == "" {
 		IPFile = defaultInputFile
 	}
@@ -38,64 +38,72 @@ func LoadIPRanges() []*net.IPAddr {
 	defer file.Close()
 	firstIPs := make([]*net.IPAddr, 0)
 	scanner := bufio.NewScanner(file)
-	// scanner.Split(bufio.ScanLines)
 	for scanner.Scan() {
-		IPString := scanner.Text()
+		ipString := scanner.Text()
 		// 如果不含有 '/' 则代表不是 IP 段，而是一个单独的 IP，因此需要加上 /32 /128 子网掩码
-		if !strings.Contains(IPString, "/") {
+		if !strings.Contains(ipString, "/") {
+			mask := "/32"
 			if IPv6 {
-				IPString += "/128"
-			} else {
-				IPString += "/32"
+				mask = "/128"
 			}
-		}
-		firstIP, IPRange, err := net.ParseCIDR(IPString)
-		// fmt.Println(firstIP)
-		// fmt.Println(IPRange)
-		if err != nil {
-			log.Fatal(err)
+			ipString += mask
 		}
 		if IPv6 {
 			//IPv6
-			loadIPv6(IPString, IPRange, firstIP, firstIPs)
+			firstIPs = append(firstIPs, loadIPv6(ipString)...)
 			continue
 		}
 		// IPv4
-		minIP, maxIP, mask := getCidrIPRange(IPString) // 获取 IP 最后一段最小值和最大值
-		maxIPNum := getCidrHostNum(mask)               // 根据子网掩码获取主机数量
-		for IPRange.Contains(firstIP) {
-			if TestAll { // 如果是测速全部 IP
-				for i := minIP; i <= maxIP; i++ { // 遍历 IP 最后一段最小值到最大值
-					firstIP[15] = i
-					firstIPCopy := make([]byte, len(firstIP))
-					copy(firstIPCopy, firstIP)
-					firstIPs = append(firstIPs, &net.IPAddr{IP: firstIPCopy})
-				}
-			} else { // 随机 IP 的最后一段 0.0.0.X
-				firstIP[15] = minIP + randipEndWith(maxIPNum)
-				firstIPCopy := make([]byte, len(firstIP))
-				copy(firstIPCopy, firstIP)
-				firstIPs = append(firstIPs, &net.IPAddr{IP: firstIPCopy})
-			}
-			firstIP[14]++ // 0.0.(X+1).X
-			if firstIP[14] == 0 {
-				firstIP[13]++ // 0.(X+1).X.X
-				if firstIP[13] == 0 {
-					firstIP[12]++ // (X+1).X.X.X
-				}
-			}
-		}
-
+		firstIPs = append(firstIPs, loadIPv4(ipString)...)
 	}
 	return firstIPs
 }

-func loadIPv6(IPString string, IPRange *net.IPNet, firstIP net.IP, firstIPs []*net.IPAddr) {
+func loadIPv4(ipString string) (firstIPs []*net.IPAddr) {
+	firstIP, IPRange, err := net.ParseCIDR(ipString)
+	// fmt.Println(firstIP)
+	// fmt.Println(IPRange)
+	if err != nil {
+		log.Fatal(err)
+	}
+	minIP, maxIP, hostNum := getCidrIPRange(ipString) // 获取 IP 最后一段最小值和最大值
+	for IPRange.Contains(firstIP) {
+		if TestAll { // 如果是测速全部 IP
+			for i := minIP; i <= maxIP; i++ { // 遍历 IP 最后一段最小值到最大值
+				firstIP[15] = i
+				firstIPCopy := make([]byte, len(firstIP))
+				copy(firstIPCopy, firstIP)
+				firstIPs = append(firstIPs, &net.IPAddr{IP: firstIPCopy})
+			}
+		} else { // 随机 IP 的最后一段 0.0.0.X
+			firstIP[15] = minIP + randipEndWith(hostNum)
+			firstIPCopy := make([]byte, len(firstIP))
+			copy(firstIPCopy, firstIP)
+			firstIPs = append(firstIPs, &net.IPAddr{IP: firstIPCopy})
+		}
+		firstIP[14]++ // 0.0.(X+1).X
+		if firstIP[14] == 0 {
+			firstIP[13]++ // 0.(X+1).X.X
+			if firstIP[13] == 0 {
+				firstIP[12]++ // (X+1).X.X.X
+			}
+		}
+	}
+	return
+}
+
+func loadIPv6(ipString string) (firstIPs []*net.IPAddr) {
+	firstIP, IPRange, err := net.ParseCIDR(ipString)
+	// fmt.Println(firstIP)
+	// fmt.Println(IPRange)
+	if err != nil {
+		log.Fatal(err)
+	}
 	var tempIP uint8
 	for IPRange.Contains(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 !strings.Contains(IPString, "/128") {
+		if !strings.Contains(ipString, "/128") {
 			firstIP[15] = randipEndWith(255) // 随机 IP 的最后一段
 			firstIP[14] = randipEndWith(255) // 随机 IP 的最后一段
 		}
@@ -170,41 +178,44 @@ func loadIPv6(IPString string, IPRange *net.IPNet, firstIP net.IP, firstIPs []*n
 		tempIP = firstIP[0]
 		firstIP[0] += randipEndWith(255)
 	}
+	return
 }

 // 根据子网掩码获取主机数量
-func getCidrHostNum(maskLen int) int {
-	cidrIPNum := int(0)
-	if maskLen < 32 {
-		var i int = int(32 - maskLen - 1)
-		for ; i >= 1; i-- {
-			cidrIPNum += 1 << i
+func getCIDRHostNum(mask uint8) (subnetNum int) {
+	if mask >= 32 {
+		return 1
+	}
+
+	if mask < 32 {
+		for i := int(32 - mask - 1); i >= 1; i-- {
+			subnetNum += 1 << i
 		}
-		cidrIPNum += 2
-	} else {
-		cidrIPNum = 1
+		subnetNum += 2
 	}
-	if cidrIPNum > 255 {
-		cidrIPNum = 255
+	if subnetNum > 0xFF {
+		subnetNum = 0xFF
 	}
-	return cidrIPNum
+	return
 }

-// 获取 IP 最后一段最小值和最大值、子网掩码
-func getCidrIPRange(cidr string) (minIP, maxIP uint8, mask int) {
-	ipRange := strings.Split(cidr, "/")
-	ipSegs := strings.Split(ipRange[0], ".")
-	mask, _ = strconv.Atoi(ipRange[1])
-	seg4, _ := strconv.Atoi(ipSegs[3])
+// 获取 IP 最后一段最小值和最大值、主机数量
+func getCidrIPRange(cidr string) (minIP, maxIP uint8, ipNum int) {
+	i := strings.IndexByte(cidr, '/')
+	addr := cidr[:i]
+	mask, _ := strconv.ParseUint(cidr[i+1:], 10, 8)
+	i = strings.LastIndexByte(addr, '.')
+	seg4, _ := strconv.ParseUint(addr[i+1:], 10, 8)
 	minIP, maxIP = getIPSegRange(uint8(seg4), uint8(32-mask))
+	ipNum = getCIDRHostNum(uint8(mask))
 	return
 }

 // 根据输入的基础IP地址和CIDR掩码计算一个IP片段的区间
 func getIPSegRange(userSegIP, offset uint8) (uint8, uint8) {
-	var ipSegMax uint8 = 255
+	var ipSegMax uint8 = 0xFF
 	netSegIP := ipSegMax << offset
 	segMinIP := netSegIP & userSegIP
-	segMaxIP := userSegIP&(255<<offset) | ^(255 << offset)
+	segMaxIP := userSegIP&(0xFF<<offset) | ^(0xFF << offset)
 	return segMinIP, segMaxIP
 }
--- a/task/tcping.go
+++ b/task/tcping.go
@@ -45,8 +45,9 @@ func checkPingDefault() {
 	}
 }

-func NewPing(ips []*net.IPAddr) *Ping {
+func NewPing() *Ping {
 	checkPingDefault()
+	ips := loadIPRanges()
 	return &Ping{
 		wg:      &sync.WaitGroup{},
 		m:       &sync.Mutex{},