From 72757e4ea84c5d0bef60e160300256392bcb48a1 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 11 Jun 2025 19:28:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dupf5002=20telnet?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BF=94=E5=9B=9E=E5=BB=B6=E8=BF=9F=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=91=BD=E4=BB=A4=E8=A1=8C=E4=B8=BA=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/telnet/telnet.go       | 4 ++--
 src/modules/trace/service/tcpdump.go | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/framework/telnet/telnet.go b/src/framework/telnet/telnet.go
index 8b2c2ec4..c72a46bd 100644
--- a/src/framework/telnet/telnet.go
+++ b/src/framework/telnet/telnet.go
@@ -27,9 +27,8 @@ func (c *ConnTelnet) NewClient() (*ConnTelnet, error) {
 	proto := "tcp"
 	if strings.Contains(c.Addr, ":") {
 		proto = "tcp6"
-		c.Addr = fmt.Sprintf("[%s]", c.Addr)
 	}
-	addr := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+	addr := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port))
 
 	// 默认等待5s
 	if c.DialTimeOut == 0 {
@@ -76,6 +75,7 @@ func (c *ConnTelnet) RunCMD(cmd string) (string, error) {
 		if _, err := conn.Write([]byte(cmd)); err != nil {
 			return "", err
 		}
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	var buf bytes.Buffer
diff --git a/src/modules/trace/service/tcpdump.go b/src/modules/trace/service/tcpdump.go
index baa772b8..28d3a942 100644
--- a/src/modules/trace/service/tcpdump.go
+++ b/src/modules/trace/service/tcpdump.go
@@ -230,6 +230,7 @@ func (s *TCPdump) UPFTrace(neType, neId, cmdStr string) (string, error) {
 		return "", err
 	}
 	defer telnetClient.Close()
+	telnetClient.RunCMD("") // 再次排空信息
 
 	// 命令拼装
 	fileName := fmt.Sprintf("%s_%s_part_%s.pcap ", neInfo.NeType, neInfo.NeId, time.Now().Format("20060102150405"))
@@ -250,11 +251,11 @@ func (s *TCPdump) UPFTrace(neType, neId, cmdStr string) (string, error) {
 
 	// 结果截取
 	arr := strings.Split(output, "\r\n")
-	if len(arr) == 2 {
+	if len(arr) < 2 {
 		return "", fmt.Errorf("trace pacp run failed")
 	}
-	if len(arr) > 3 {
-		resMsg := arr[2]
+	if len(arr) == 3 {
+		resMsg := arr[1]
 		// pcap trace: unknown input `f file UPF_001_part_2024-08-19...'
 		// pcap trace: dispatch trace already enabled...
 		// pcap trace: dispatch trace already disabled...