加入 404星链

Plugins/portscan.go

@@ -26,6 +26,7 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
 	go func() {
 		for found := range results {
 			AliveAddress = append(AliveAddress, found)
+			wg.Done()
 		}
 	}()
 
@@ -33,7 +34,7 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
 	for i := 0; i < workers; i++ {
 		go func() {
 			for addr := range Addrs {
-				PortConnect(addr, results, timeout)
+				PortConnect(addr, results, timeout, &wg)
 				wg.Done()
 			}
 		}()
@@ -42,18 +43,17 @@ func PortScan(hostslist []string, ports string, timeout int64) []string {
 	//添加扫描目标
 	for _, port := range probePorts {
 		for _, host := range hostslist {
-			Addrs <- Addr{host, port}
 			wg.Add(1)
+			Addrs <- Addr{host, port}
 		}
 	}
-
 	wg.Wait()
 	close(Addrs)
 	close(results)
 	return AliveAddress
 }
 
-func PortConnect(addr Addr, respondingHosts chan<- string, adjustedTimeout int64) {
+func PortConnect(addr Addr, respondingHosts chan<- string, adjustedTimeout int64, wg *sync.WaitGroup) {
 	host, port := addr.ip, addr.port
 	con, err := net.DialTimeout("tcp4", fmt.Sprintf("%s:%v", host, port), time.Duration(adjustedTimeout)*time.Second)
 	if err == nil {
@@ -62,5 +62,6 @@ func PortConnect(addr Addr, respondingHosts chan<- string, adjustedTimeout int64
 		result := fmt.Sprintf("%s open", address)
 		common.LogSuccess(result)
 		respondingHosts <- address
+		wg.Add(1)
 	}
 }

Plugins/scanner.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 )
 
 func Scan(info common.HostInfo) {
@@ -65,7 +64,7 @@ func Scan(info common.HostInfo) {
 		}
 	}
 	wg.Wait()
-	time.Sleep(100 * time.Millisecond)
+	common.Logwg.Wait()
 	close(common.Results)
 	fmt.Println(fmt.Sprintf("已完成 %v/%v", common.End, common.Num))
 }
@@ -78,10 +77,8 @@ func AddScan(scantype string, info common.HostInfo, ch chan struct{}, wg *sync.W
 		Mutex.Lock()
 		common.Num += 1
 		Mutex.Unlock()
-
 		ScanFunc(PluginList, scantype, &info)
 		wg.Done()
-
 		Mutex.Lock()
 		common.End += 1
 		Mutex.Unlock()