mod: 丰富和移动GetAllDevs函数

XinRoom · Mar 4, 2023 · 54143e5 · 54143e5
1 parent ee4a70a
commit 54143e5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/core/port/syn/device.go b/core/port/syn/device.go
@@ -10,8 +10,25 @@ import (
 	"github.com/jackpal/gateway"
 	"github.com/libp2p/go-netroute"
 	"net"
+	"strings"
 )
 
+func GetAllDevs() (string, error) {
+	pcapDevices, err := pcap.FindAllDevs()
+	if err != nil {
+		return "", errors.New(fmt.Sprintf("list pcapDevices failed: %s", err.Error()))
+	}
+	var buf strings.Builder
+	for _, dev := range pcapDevices {
+		buf.WriteString(fmt.Sprint("Dev:", dev.Name, "\tDes:", dev.Description))
+		if len(dev.Addresses) > 0 {
+			buf.WriteString(fmt.Sprint("\tAddr:", dev.Addresses[0].IP.String()))
+		}
+		buf.WriteString("\n")
+	}
+	return buf.String(), nil
+}
+
 // GetDevByIp get dev name by dev ip (use pcap)
 func GetDevByIp(ip net.IP) (devName string, err error) {
 	devices, err := pcap.FindAllDevs()

diff --git a/core/port/syn/syn.go b/core/port/syn/syn.go
@@ -11,7 +11,6 @@ import (
 	limiter "golang.org/x/time/rate"
 	"math/rand"
 	"net"
-	"strings"
 	"sync"
 	"time"
 )
@@ -427,15 +426,3 @@ func (ss *synScanner) recv() {
 		}
 	}
 }
-
-func GetAllDevs() (string, error) {
-	pcapDevices, err := pcap.FindAllDevs()
-	if err != nil {
-		return "", errors.New(fmt.Sprintf("list pcapDevices failed: %s", err.Error()))
-	}
-	var buf strings.Builder
-	for _, dev := range pcapDevices {
-		buf.WriteString(fmt.Sprintln("Dev:", dev.Name, "\tDes:", dev.Description))
-	}
-	return buf.String(), nil
-}