From 1c8655d657e22110118f351bd8517bda4f055709 Mon Sep 17 00:00:00 2001 From: hopetree Date: Sat, 27 Apr 2024 00:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96tcp=E5=92=8Cudp=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8D=A2=E6=88=90net=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/version.go | 2 +- host/network.go | 29 ++++------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/app/version.go b/app/version.go index 3aa1aa2..7666922 100644 --- a/app/version.go +++ b/app/version.go @@ -1,3 +1,3 @@ package app -const RuntimeVersion = "0.1.3" +const RuntimeVersion = "0.1.4" diff --git a/host/network.go b/host/network.go index 605aab8..3178a84 100644 --- a/host/network.go +++ b/host/network.go @@ -3,9 +3,6 @@ package host import ( "fmt" "github.com/shirou/gopsutil/net" - "os/exec" - "strconv" - "strings" "time" ) @@ -54,33 +51,15 @@ func getNetworkSpeedStr() (uploadSpeedStr, downloadSpeedStr string, err error) { func getConnections() (int, int, error) { var tcp, udp int - cmd := exec.Command("sh", "-c", "expr $(ss -t | wc -l) - 1") - // 获取命令输出 - tcpString, err := cmd.Output() + tcpConnCount, err := net.Connections("tcp") if err == nil { - tcpNum, err := strconv.Atoi(strings.TrimSpace(string(tcpString))) - if err == nil { - tcp = tcpNum - if tcp < 0 { - tcp = 0 - } - } + tcp = len(tcpConnCount) } - cmd = exec.Command("sh", "-c", "expr $(ss -u | wc -l) - 1") - - // 获取命令输出 - udpString, err := cmd.Output() + udpConnCount, err := net.Connections("udp") if err == nil { - udpNum, err := strconv.Atoi(strings.TrimSpace(string(udpString))) - if err == nil { - udp = udpNum - if udp < 0 { - udp = 0 - } - } + udp = len(udpConnCount) } - return tcp, udp, nil }