♻️ 使用单个切片来处理ip列表

Author: coolrc136

cmd/lmap/main.go

@@ -31,7 +31,7 @@ func main() {
 	flag.Parse()
 	args := flag.Args()
 	if len(args) < 1 {
-		fmt.Fprintf(os.Stderr, "使用方法：%s [-v] <网络号>/<CIDR>\n", os.Args[0])
+		_, _ = fmt.Fprintf(os.Stderr, "使用方法：%s [-v] <网络号>/<CIDR>\n", os.Args[0])
 		os.Exit(-1)
 	}
 	lmap.CheckIP(args[0], isVerbose)

pkg/lmap/check_ip.go

@@ -20,64 +20,55 @@ package lmap
 
 import (
 	"fmt"
-	"net"
 	"os"
 	"sync"
 	"time"
 )
 
-const OUTPUT_IP_PER_LINE = 5
+const OUTPUT_IP_PER_LINE = 3
 
 func CheckIP(subnet string, isVerbose bool) {
 	checkerGroup := &sync.WaitGroup{}
 	t := time.Now()
 	hosts, _ := GetAllIPsFromCIDR(subnet)
-	isUsedList := make([]bool, len(hosts))
-	for index, _ := range hosts {
+	for index := range hosts {
 		time.Sleep(500)
 		checkerGroup.Add(1)
+
 		go func(index int) {
 			defer checkerGroup.Done()
-			isUsed := Ping(hosts[index])
-			isUsedList[index] = isUsed
+			hosts[index].isUsed = Ping(hosts[index].host)
 			if isVerbose {
-				if isUsed {
-					println("已使用IP：", hosts[index].String())
+				if hosts[index].isUsed {
+					println("已使用IP：", hosts[index].host.String())
 				} else {
-					println("未使用IP：", hosts[index].String())
+					println("未使用IP：", hosts[index].host.String())
 				}
 			}
 		}(index)
 	}
 	checkerGroup.Wait()
 	elapsed := time.Since(t)
-	fmt.Fprintln(os.Stderr, "IP扫描完成,耗时", elapsed)
-	println("已使用IP：")
-	printIPList(hosts, true, isUsedList)
-	println("未使用IP：")
-	printIPList(hosts, false, isUsedList)
+	_, _ = fmt.Fprintln(os.Stderr, "IP扫描完成,耗时", elapsed)
+	fmt.Println("已使用IP：")
+	printIPList(hosts, true)
+	fmt.Println("未使用IP：")
+	printIPList(hosts, false)
 }
 
-func printIPList(hosts []net.IP, boolFilter bool, boolFilterTargetList []bool) {
-	firstIndex := 0
-	count := 0
-	for index, ip := range hosts {
-		if boolFilterTargetList[index] == boolFilter {
-			fmt.Print(ip.String())
-			firstIndex = index
-			count = 1
-			break
-		}
-	}
-	for index := firstIndex + 1; index < len(hosts); index++ {
-		if boolFilterTargetList[index] == boolFilter {
-			if count%OUTPUT_IP_PER_LINE == 0 {
-				fmt.Println("")
+func printIPList(hosts []HostInfo, boolFilter bool) {
+
+	position := 1
+
+	for _,hostInfo :=range hosts{
+		if boolFilter==hostInfo.isUsed {
+			fmt.Print(hostInfo.host.String())
+			if position%OUTPUT_IP_PER_LINE == 0 {
+				fmt.Println()
 			} else {
 				fmt.Print(", ")
 			}
-			fmt.Print(hosts[index].String())
-			count++
+			position++
 		}
 	}
 	fmt.Println("")

pkg/lmap/common.go

@@ -18,10 +18,17 @@
 
 package lmap
 
+import "net"
+
 type ICMP struct {
 	Type        uint8
 	Code        uint8
 	Checksum    uint16
 	Identifier  uint16
 	SequenceNum uint16
 }
+
+type HostInfo struct {
+	host   net.IP
+	isUsed bool
+}

pkg/lmap/parse_subnet.go

@@ -20,20 +20,23 @@ package lmap
 
 import "net"
 
-func GetAllIPsFromCIDR(cidr string) ([]net.IP, error) {
-	ip, ipnet, err := net.ParseCIDR(cidr)
+func GetAllIPsFromCIDR(cidr string) ([]HostInfo, error) {
+	ip, ipNet, err := net.ParseCIDR(cidr)
 	if err != nil {
 		return nil, err
 	}
 
-	var ips []net.IP
-	for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
-		ips = append(ips, dupIP(ip))
+	var ips []HostInfo
+	for ip := ip.Mask(ipNet.Mask); ipNet.Contains(ip); inc(ip) {
+		ips = append(ips, HostInfo{
+			host:   dupIP(ip),
+			isUsed: false,
+		})
 	}
 	if len(ips) <= 2 {
 		return ips, nil
 	}
-	return ips[1 : len(ips)-1], nil
+	return ips[0 : len(ips)-1], nil
 }
 
 func inc(ip net.IP) {