adjust linux network speed monitor

go.mod

@@ -5,8 +5,11 @@ go 1.16
 require (
 	b612.me/stario v0.0.7
 	b612.me/win32api v0.0.1
-	b612.me/wincmd v0.0.1
+	b612.me/wincmd v0.0.2
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/sys v0.4.0
-	golang.org/x/sys v0.0.0-20220318055525-2edf467146b5
+)
+
+require (
+	golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 )

go.sum

@@ -1,24 +1,20 @@
-b612.me/stario v0.0.5 h1:Q1OGF+8eOoK49zMzkyh80GWaMuknhey6+PWJJL9ZuNo=
-b612.me/stario v0.0.5/go.mod h1:or4ssWcxQSjMeu+hRKEgtp0X517b3zdlEOAms8Qscvw=
 b612.me/stario v0.0.7 h1:QbQcsHCVLE6vRgVrPN4+9DGiSaC6IWdtm4ClL2tpMUg=
 b612.me/stario v0.0.7/go.mod h1:or4ssWcxQSjMeu+hRKEgtp0X517b3zdlEOAms8Qscvw=
 b612.me/win32api v0.0.1 h1:vLFB1xhO6pd9+zB2EyaapKB459Urv3v+C1YwgwOFEWo=
 b612.me/win32api v0.0.1/go.mod h1:MHu0JBQjzxQ2yxpZPUBbn5un45o67eF5iWKa4Q9e0yE=
-b612.me/wincmd v0.0.1 h1:4+RCFKHuD/JqAYsdtO6sTNKJs1nQVMQo87h6KhTJjkM=
+b612.me/wincmd v0.0.2 h1:Ub1WtelVT6a3vD4B6zDYo3UPO/t9ymnI3x1dQPJcrGw=
-b612.me/wincmd v0.0.1/go.mod h1:32xTM7qWAI7jx6qwTrig05rxejSYbSp7CX5WD7qsMxY=
+b612.me/wincmd v0.0.2/go.mod h1:bwpyCKfSDY8scSMo3Lrd0Qnqvpz7/CILL7oodfG0wgo=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE=
 golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
+golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 h1:saXMvIOKvRFwbOMicHXr0B1uwoxq9dGmLe5ExMES6c4=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

network_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package staros
@@ -67,7 +68,13 @@ func NetSpeeds(duration time.Duration) ([]NetSpeed, error) {
 	for k, v := range list1 {
 		recv := float64(list2[k].RecvBytes-v.RecvBytes) / duration.Seconds()
 		send := float64(list2[k].SendBytes-v.SendBytes) / duration.Seconds()
-		res = append(res, NetSpeed{v.Name, recv, send})
+		res = append(res, NetSpeed{
+			Name:       v.Name,
+			RecvSpeeds: recv,
+			SendSpeeds: send,
+			RecvBytes:  list2[k].RecvBytes,
+			SendBytes:  list2[k].SendBytes,
+		})
 	}
 	return res, nil
 }
@@ -87,12 +94,12 @@ func NetSpeedsByName(duration time.Duration, name string) (NetSpeed, error) {
 
 // NetConnections return all TCP/UDP/UNIX DOMAIN SOCKET Connections
 // if your uid != 0 ,and analysePid==true ,you should have CAP_SYS_PRTACE and CAP_DAC_OVERRIDE/CAP_DAC_READ_SEARCH Caps
-func NetConnections(analysePid bool,types string) ([]NetConn, error) {
+func NetConnections(analysePid bool, types string) ([]NetConn, error) {
 	var result []NetConn
 	var inodeMap map[string]int64
 	var err error
 	var fileList []string
-	if types=="" || strings.Contains(strings.ToLower(types),"all") {
+	if types == "" || strings.Contains(strings.ToLower(types), "all") {
 		fileList = []string{
 			"/proc/net/tcp",
 			"/proc/net/tcp6",
@@ -101,14 +108,14 @@ func NetConnections(analysePid bool,types string) ([]NetConn, error) {
 			"/proc/net/unix",
 		}
 	}
-	if strings.Contains(strings.ToLower(types),"tcp") {
+	if strings.Contains(strings.ToLower(types), "tcp") {
-		fileList =append(fileList,"/proc/net/tcp","/proc/net/tcp6")
+		fileList = append(fileList, "/proc/net/tcp", "/proc/net/tcp6")
 	}
-	if strings.Contains(strings.ToLower(types),"udp") {
+	if strings.Contains(strings.ToLower(types), "udp") {
-		fileList =append(fileList,"/proc/net/udp","/proc/net/udp6")
+		fileList = append(fileList, "/proc/net/udp", "/proc/net/udp6")
 	}
-	if strings.Contains(strings.ToLower(types),"unix") {
+	if strings.Contains(strings.ToLower(types), "unix") {
-		fileList =append(fileList,"/proc/net/unix")
+		fileList = append(fileList, "/proc/net/unix")
 	}
 	if analysePid {
 		inodeMap, err = GetInodeMap()

typed.go

@@ -35,9 +35,11 @@ type NetAdapter struct {
 }
 
 type NetSpeed struct {
-	Name      string
+	Name       string
-	RecvBytes float64
+	RecvSpeeds float64
-	SendBytes float64
+	SendSpeeds float64
+	RecvBytes  uint64
+	SendBytes  uint64
 }
 
 // Process 定义一个进程的信息