ref: 重构抓包功能，超时30分钟

src/modules/trace/controller/tcpdump.go

@@ -1,16 +1,9 @@
 package controller
 
 import (
-	"fmt"
-	"strings"
-
-	"ems.agt/src/framework/cmd"
-	"ems.agt/src/framework/config"
 	"ems.agt/src/framework/i18n"
 	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/ssh"
 	"ems.agt/src/framework/vo/result"
-	netElementService "ems.agt/src/modules/network_element/service"
 	traceService "ems.agt/src/modules/trace/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
@@ -18,7 +11,6 @@ import (
 
 // 实例化控制层 TcpdumpController 结构体
 var NewTcpdump = &TcpdumpController{
-	NeInfoService:  netElementService.NewNeInfoImpl,
 	TcpdumpService: traceService.NewTcpdumpImpl,
 }
 
@@ -26,23 +18,19 @@ var NewTcpdump = &TcpdumpController{
 //
 // PATH /tcpdump
 type TcpdumpController struct {
-	// 网元信息服务
-	NeInfoService netElementService.INeInfo
 	// 信令抓包服务
 	TcpdumpService traceService.ITcpdump
 }
 
-// 网元发送执行 pcap
+// 网元抓包PACP 开始
 //
-// POST /ne
+// POST /start
-func (s *TcpdumpController) NeTask(c *gin.Context) {
+func (s *TcpdumpController) DumpStart(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var body struct {
-		NeType    string `json:"neType" binding:"required"`    // 网元类型
+		NeType string `json:"neType" binding:"required"` // 网元类型
-		NeId      string `json:"neId" binding:"required"`      // 网元ID
+		NeId   string `json:"neId" binding:"required"`   // 网元ID
-		Timeout   int    `json:"timeout" binding:"required"`   // 超时时间
+		Cmd    string `json:"cmd" binding:"required"`    // 命令 "-n -s 0 -v -w"
-		Cmd       string `json:"cmd" binding:"required"`       // 命令
-		Timestamp string `json:"timestamp" binding:"required"` // 时间戳
 	}
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil {
@@ -50,47 +38,32 @@ func (s *TcpdumpController) NeTask(c *gin.Context) {
 		return
 	}
 
-	// 检查网元信息
+	fileName, err := s.TcpdumpService.DumpStart(body.NeType, body.NeId, body.Cmd)
-	neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId)
+	if err != nil {
-	if neInfo.NeId != body.NeId {
+		msg := err.Error()
-		// 找不到 %s %s 对应网元信息
+		if msg == "noData" {
-		msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+			// 找不到 %s %s 对应网元信息
+			msg = i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+		}
 		c.JSON(200, result.ErrMsg(msg))
 		return
 	}
-
-	filePcapName := fmt.Sprintf("%s_%s_%s.pcap", body.Timestamp, body.NeType, body.NeId)
-	fileLogName := fmt.Sprintf("%s_%s_%s.log", body.Timestamp, body.NeType, body.NeId)
-	writeLog := fmt.Sprintf(" > %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件，放置弹出code 127
-	cmdStr := fmt.Sprintf("cd /tmp \nsudo timeout %d tcpdump -i any %s -s0 -w %s", body.Timeout, body.Cmd, filePcapName)
-	usernameNe := config.Get("ne.user").(string) // 网元统一用户
-	sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
-	msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr+writeLog)
-	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
-		return
-	}
-	if strings.Contains(msg, "command not found") {
-		c.JSON(200, result.ErrMsg("Command [tcpdump] Not Found"))
-		return
-	}
-
 	c.JSON(200, result.OkData(map[string]any{
-		"cmd":      cmdStr,
+		"msg": "tcpdump started",
-		"msg":      msg,
+		"out": fileName,
-		"fileName": filePcapName,
+		"log": "",
 	}))
 }
 
-// 网元抓包pcap文件下载
+// 网元抓包PACP 结束
 //
-// POST /download
+// POST /stop
-func (s *TcpdumpController) Download(c *gin.Context) {
+func (s *TcpdumpController) DumpStop(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var body struct {
 		NeType   string `json:"neType" binding:"required"` // 网元类型
 		NeId     string `json:"neId" binding:"required"`   // 网元ID
-		FileName string `form:"fileName" `                 // 文件名
+		FileName string `json:"fileName"`                  // 文件名 查看日志信息
 	}
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil {
@@ -98,37 +71,34 @@ func (s *TcpdumpController) Download(c *gin.Context) {
 		return
 	}
 
-	// 检查网元信息
+	logMsg, err := s.TcpdumpService.DumpStop(body.NeType, body.NeId, body.FileName)
-	neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId)
+	if err != nil {
-	if neInfo.NeId != body.NeId {
+		msg := err.Error()
-		// 找不到 %s %s 对应网元信息
+		if msg == "noData" {
-		msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+			// 找不到 %s %s 对应网元信息
+			msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+			c.JSON(200, result.ErrMsg(msg))
+			return
+		}
 		c.JSON(200, result.ErrMsg(msg))
 		return
 	}
-
+	c.JSON(200, result.OkData(map[string]any{
-	nePath := fmt.Sprintf("/tmp/%s", body.FileName)
+		"msg": "tcpdump stopped",
-	localPath := fmt.Sprintf("/tmp/omc/tcpdump/%s", body.FileName)
+		"out": body.FileName,
-	err = ssh.FileSCPNeToLocal(neInfo.IP, nePath, localPath)
+		"log": logMsg,
-	if err != nil {
+	}))
-		c.JSON(200, result.ErrMsg(err.Error()))
-		return
-	}
-
-	c.FileAttachment(localPath, body.FileName)
 }
 
-// 网元发送执行 pcap
+// UPF标准版内部抓包
 //
-// POST /neUPF
+// POST /traceUPF
-func (s *TcpdumpController) NeUPFTask(c *gin.Context) {
+func (s *TcpdumpController) TraceUPF(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var body struct {
-		NeType    string `json:"neType" binding:"required"`    // 网元类型
+		NeType string `json:"neType" binding:"required"` // 网元类型
-		NeId      string `json:"neId" binding:"required"`      // 网元ID
+		NeId   string `json:"neId" binding:"required"`   // 网元ID
-		RunType   string `json:"runType" binding:"required"`   // 执行开始start还是停止stop
+		Cmd    string `json:"cmd" binding:"required"`    // 命令
-		Cmd       string `json:"cmd" binding:"required"`       // 命令
-		Timestamp string `json:"timestamp" binding:"required"` // 时间戳
 	}
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil {
@@ -136,154 +106,19 @@ func (s *TcpdumpController) NeUPFTask(c *gin.Context) {
 		return
 	}
 
-	// 检查网元信息
+	fileName, logMsg, err := s.TcpdumpService.DumpUPF(body.NeType, body.NeId, body.Cmd)
-	neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId)
+	if err != nil {
-	if neInfo.NeId != body.NeId {
+		msg := err.Error()
-		msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+		if msg == "noData" {
+			// 找不到 %s %s 对应网元信息
+			msg = i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId})
+		}
 		c.JSON(200, result.ErrMsg(msg))
 		return
 	}
-
+	c.JSON(200, result.OkData(map[string]any{
-	// 开始telnet
+		"msg": "trace UPF dump pacp",
-	if body.RunType == "start_telnet" {
+		"out": fileName,
-		filePcapName := fmt.Sprintf("%s_%s_%s.pcap", body.Timestamp, body.NeType, body.NeId)
+		"log": logMsg,
-		cmdStr := fmt.Sprintf("%s file %s", body.Cmd, filePcapName)
+	}))
-		// 进行连接telnet
-		resultStr, err := s.TcpdumpService.UPFTelnet(neInfo.IP, cmdStr)
-		if err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
-			return
-		}
-		// 处理结果
-		s := strings.Index(resultStr, "pcap dispatch trace:")
-		if s == -1 {
-			s = strings.Index(resultStr, "Write ")
-		}
-		if s != -1 {
-			e := strings.Index(resultStr, "\r\nupfd1#")
-			resultStr = resultStr[s:e]
-		} else {
-			resultStr = "No stoppable found"
-		}
-		c.JSON(200, result.OkData(map[string]any{
-			"cmd":      cmdStr,
-			"msg":      resultStr,
-			"fileName": filePcapName,
-		}))
-		return
-	}
-	// 停止telnet
-	if body.RunType == "stop_telnet" {
-		filePcapName := fmt.Sprintf("%s_%s_%s.pcap", body.Timestamp, body.NeType, body.NeId)
-		cmdStr := "pcap dispatch trace off"
-		// 进行连接telnet
-		resultStr, err := s.TcpdumpService.UPFTelnet(neInfo.IP, cmdStr)
-		if err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
-			return
-		}
-		// 处理结果
-		s := strings.Index(resultStr, "pcap dispatch trace:")
-		if s != -1 {
-			e := strings.Index(resultStr, "\r\nupfd1#")
-			resultStr = resultStr[s:e]
-		} else {
-			resultStr = "Executed, please stop before proceeding"
-		}
-		c.JSON(200, result.OkData(map[string]any{
-			"cmd":      cmdStr,
-			"msg":      resultStr,
-			"fileName": filePcapName,
-		}))
-		return
-	}
-
-	// 开始-脚本字符串
-	if body.RunType == "start_str" {
-		fileLogName := fmt.Sprintf("%s_%s_%s.log", body.Timestamp, body.NeType, body.NeId)
-		filePcapName := fmt.Sprintf("%s_%s_%s.pcap", body.Timestamp, body.NeType, body.NeId)
-		scriptStr := "set capcmd [lindex $argv 0]\nspawn telnet localhost 5002\nexpect \"upfd1# \"\nsend \"$capcmd\\n\"\nexpect \"upfd1# \"\nsend \"quit\\n\"\nexpect \"eof\""
-		writeLog := fmt.Sprintf(" > %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件输出，避免弹出code 127
-
-		capCmdStr := fmt.Sprintf("%s file %s", body.Cmd, filePcapName)
-
-		cmdStr := fmt.Sprintf("cd /tmp\n\necho '%s' > cap.sh\n\nchmod +x cap.sh\n\nexpect ./cap.sh '%s'%s", scriptStr, capCmdStr, writeLog)
-		usernameNe := config.Get("ne.user").(string) // 网元统一用户
-		sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
-		msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr)
-		if err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
-			return
-		}
-		if strings.Contains(msg, "command not found") {
-			c.JSON(200, result.ErrMsg("Command [expect] Not Found"))
-			return
-		}
-		if strings.Contains(msg, "Unable to connect to remote host") {
-			c.JSON(200, result.ErrMsg("Connection Refused"))
-			return
-		}
-		s := strings.Index(msg, "pcap dispatch trace:")
-		if s != -1 {
-			e := strings.Index(msg, "\r\nupfd1#")
-			msg = msg[s:e]
-		} else {
-			msg = "Executed, please stop before proceeding"
-		}
-		c.JSON(200, result.OkData(map[string]any{
-			"cmd":      capCmdStr,
-			"msg":      msg,
-			"fileName": filePcapName,
-		}))
-		return
-	}
-	// 停止-脚本字符串
-	if body.RunType == "stop_str" {
-		fileLogName := fmt.Sprintf("%s_%s_%s.log", body.Timestamp, body.NeType, body.NeId)
-		filePcapName := fmt.Sprintf("%s_%s_%s.pcap", body.Timestamp, body.NeType, body.NeId)
-		scriptStr := "set capcmd [lindex $argv 0]\nspawn telnet localhost 5002\nexpect \"upfd1# \"\nsend \"$capcmd\\n\"\nexpect \"upfd1# \"\nsend \"quit\\n\"\nexpect \"eof\""
-		writeLog := fmt.Sprintf(" > %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件输出，避免弹出code 127
-
-		capCmdStr := body.Cmd
-
-		cmdStr := fmt.Sprintf("cd /tmp\n\necho '%s' > cap.sh\n\nchmod +x cap.sh\n\nexpect ./cap.sh '%s'%s", scriptStr, capCmdStr, writeLog)
-
-		usernameNe := config.Get("ne.user").(string) // 网元统一用户
-		sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
-		msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr)
-		if err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
-			return
-		}
-		if strings.Contains(msg, "command not found") {
-			c.JSON(200, result.ErrMsg("Command [expect] Not Found"))
-			return
-		}
-		if strings.Contains(msg, "Unable to connect to remote host") {
-			c.JSON(200, result.ErrMsg("Connection Refused"))
-			return
-		}
-		s := strings.Index(msg, "pcap dispatch trace:")
-		if s == -1 {
-			s = strings.Index(msg, "Write ")
-			// 停止写入的文件名
-			startIndex := strings.LastIndex(msg, "/") + 1
-			endIndex := strings.LastIndex(msg, ",")
-			filePcapName = msg[startIndex:endIndex]
-		}
-		if s != -1 {
-			e := strings.Index(msg, "\r\nupfd1#")
-			msg = msg[s:e]
-		} else {
-			msg = "No stoppable found"
-		}
-		c.JSON(200, result.OkData(map[string]any{
-			"cmd":      capCmdStr,
-			"msg":      msg,
-			"fileName": filePcapName,
-		}))
-		return
-	}
-
-	c.JSON(200, result.ErrMsg("Please select RunType to execute: start_telnet/stop_telnet/start_str/stop_str"))
 }

src/modules/trace/service/tcpdump.go

@@ -1,7 +1,13 @@
 package service
 
-// 通用请求 服务层接口
+// 信令抓包 服务层接口
 type ITcpdump interface {
-	// UPFTelnetStart UPF进行telnet抓包
+	// DumpStart 触发tcpdump开始抓包 filePcapName, err
-	UPFTelnet(neIp, cmdStr string) (string, error)
+	DumpStart(neType, neId, cmdStr string) (string, error)
+
+	// DumpStop 停止已存在抓包句柄
+	DumpStop(neType, neId, fileName string) (string, error)
+
+	// DumpUPF UPF标准版抓包
+	DumpUPF(neType, neId, cmdStr string) (string, string, error)
 }

src/modules/trace/service/tcpdump.impl.go

@@ -2,40 +2,184 @@ package service
 
 import (
 	"fmt"
-	"net"
+	"strings"
 	"time"
 
+	"ems.agt/src/framework/cmd"
+	"ems.agt/src/framework/config"
+	"ems.agt/src/framework/logger"
+	"ems.agt/src/framework/utils/date"
 	neService "ems.agt/src/modules/network_element/service"
 )
 
 // 实例化服务层 TcpdumpImpl 结构体
 var NewTcpdumpImpl = &TcpdumpImpl{
 	neInfoService: neService.NewNeInfoImpl,
+	tcpdumpPIDMap: map[string]string{},
 }
 
-// 通用请求 服务层处理
+// 信令抓包 服务层处理
 type TcpdumpImpl struct {
 	// 网元信息服务
 	neInfoService neService.INeInfo
+	// 抓包进程PID
+	tcpdumpPIDMap map[string]string
 }
 
-// UPFTelnetStart UPF进行telnet抓包
+// DumpStart 触发tcpdump开始抓包 filePcapName, err
-func (s *TcpdumpImpl) UPFTelnet(neIp, cmdStr string) (string, error) {
+func (s *TcpdumpImpl) DumpStart(neType, neId, cmdStr string) (string, error) {
-	// 创建TCP连接
+	// 检查网元信息
-	conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", neIp, 5002))
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(neType, neId)
-	if err != nil {
+	if neInfo.NeId != neId {
+		return "", fmt.Errorf("noData")
+	}
+
+	// SSH命令
+	usernameNe := config.Get("ne.user").(string) // 网元统一用户
+	sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
+
+	// 是否拥有sudo权限并拼接
+	withSudo := ""
+	if _, err := cmd.ExecWithCheck("ssh", sshHost, "sudo -n uname"); err == nil {
+		withSudo = "sudo "
+	}
+
+	if msg, err := cmd.ExecWithCheck("ssh", sshHost, fmt.Sprintf("%s tcpdump --version", withSudo)); err != nil {
+		//  stderr: bash: tcpdump：未找到命令 => exit status 127
+		msg = strings.TrimSpace(msg)
+		logger.Warnf("DumpStart err: %s => %s", msg, err.Error())
+		return "", fmt.Errorf(msg)
+	}
+
+	// 拼装命令
+	neTypeID := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
+	timeStr := date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS)
+	fileName := fmt.Sprintf("%s_%s", timeStr, neTypeID)
+	sendCmd := fmt.Sprintf("cd /tmp \n %s nohup timeout 30m tcpdump -i any %s -s0 -w %s.pcap > %s.log 2>&1 & \necho $!", withSudo, cmdStr, fileName, fileName)
+	// cd /tmp
+	// sudo nohup timeout 60m tcpdump -i any -n -s 0 -v -w -s0 -w 20240115140822_UDM_001.pcap > 20240115140822_UDM_001.log 2>&1 & echo $!
+	msg, err := cmd.ExecWithCheck("ssh", sshHost, sendCmd)
+	msg = strings.TrimSpace(msg)
+	if err != nil || strings.HasPrefix(msg, "stderr:") {
+		logger.Warnf("DumpStart err: %s => %s", msg, err.Error())
 		return "", err
 	}
-	defer conn.Close()
 
-	fmt.Fprintln(conn, cmdStr)
+	// 检查进程 ps aux | grep tcpdump
-
+	// 强杀 sudo pkill tcpdump
-	// 读取内容
+	s.tcpdumpPIDMap[neTypeID] = msg
-	time.Sleep(time.Duration(300) * time.Millisecond)
+	return fileName, err
-	buf := make([]byte, 1024*8)
+}
-	n, err := conn.Read(buf)
+
-	if err != nil {
+// DumpStop 停止已存在抓包句柄
-		return "", err
+func (s *TcpdumpImpl) DumpStop(neType, neId, fileName string) (string, error) {
-	}
+	// 检查网元信息
-	return string(buf[0:n]), nil
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	if neInfo.NeId != neId {
+		return "", fmt.Errorf("noData")
+	}
+
+	// SSH命令
+	usernameNe := config.Get("ne.user").(string) // 网元统一用户
+	sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
+
+	// 是否拥有sudo权限并拼接
+	withSudo := ""
+	if _, err := cmd.ExecWithCheck("ssh", sshHost, "sudo -n uname"); err == nil {
+		withSudo = "sudo "
+	}
+
+	// 是否存在进程
+	neTypeID := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
+	pid, ok := s.tcpdumpPIDMap[neTypeID]
+	if !ok || pid == "" {
+		return "", fmt.Errorf("tcpdump is not running")
+	}
+
+	// 查看日志
+	viewLogFile := ""
+	if fileName != "" && strings.Contains(fileName, neTypeID) {
+		viewLogFile = fmt.Sprintf("\n cat %s.log", fileName)
+	}
+
+	// 拼装命令
+	sendCmd := fmt.Sprintf("cd /tmp \n %s kill %s %s", withSudo, pid, viewLogFile)
+	msg, err := cmd.ExecWithCheck("ssh", sshHost, sendCmd)
+	delete(s.tcpdumpPIDMap, neTypeID)
+	if err != nil || strings.HasPrefix(msg, "stderr:") {
+		logger.Warnf("DumpStop err: %s => %s", strings.TrimSpace(msg), err.Error())
+		return "", err
+	}
+	return msg, nil
+}
+
+// DumpUPF UPF标准版抓包
+func (s *TcpdumpImpl) DumpUPF(neType, neId, cmdStr string) (string, string, error) {
+	// 检查网元信息
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	if neInfo.NeId != neId {
+		return "", "", fmt.Errorf("noData")
+	}
+
+	// SSH命令
+	usernameNe := config.Get("ne.user").(string) // 网元统一用户
+	sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.IP)
+
+	// 是否拥有sudo权限并拼接
+	withSudo := ""
+	if _, err := cmd.ExecWithCheck("ssh", sshHost, "sudo -n uname"); err == nil {
+		withSudo = "sudo "
+	}
+
+	if msg, err := cmd.ExecWithCheck("ssh", sshHost, fmt.Sprintf("%s expect -version", withSudo)); err != nil {
+		//  stderr: bash: expect：未找到命令 => exit status 127
+		msg = strings.TrimSpace(msg)
+		logger.Warnf("DumpUPF err: %s => %s", msg, err.Error())
+		return "", "", fmt.Errorf(msg)
+	}
+
+	// 拼装命令
+	neTypeID := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
+	timeStr := date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS)
+	fileName := fmt.Sprintf("%s_%s", timeStr, neTypeID)
+	// UPF标准版本telnet脚本
+	scriptStr := "set pcapCmd [lindex $argv 0]\nspawn telnet localhost 5002\nexpect \"upfd1# \"\nsend \"$pcapCmd\\n\"\nexpect \"upfd1# \"\nsend \"quit\\n\"\nexpect \"eof\""
+	writePcapFile := fmt.Sprintf("echo '%s' > pcapUPF.sh\n %s chmod +x pcapUPF.sh", scriptStr, withSudo)
+	writeLogFile := fmt.Sprintf("> %s.log 2>&1 \ncat %s.log", fileName, fileName)
+
+	// 以off结尾是停止抓包，不需要写文件
+	pcapCmd := cmdStr
+	if !strings.HasSuffix(pcapCmd, "off") {
+		pcapCmd = fmt.Sprintf("%s file %s.pcap", cmdStr, fileName)
+	}
+	sendCmd := fmt.Sprintf("cd /tmp \n%s\n expect ./pcapUPF.sh '%s' %s", writePcapFile, pcapCmd, writeLogFile)
+	// cd /tmp
+	// echo '' >
+	// expect ./cap.sh > pcapUPF.sh
+	// sudo  chmod +x pcapUPF.sh
+	// expect ./cap.sh 'pcap dispatch trace off' > 20240115165701_UDM_001.log 2>&1
+	// cat 20240115165701_UDM_001.log
+	msg, err := cmd.ExecWithCheck("ssh", sshHost, sendCmd)
+	msg = strings.TrimSpace(msg)
+	if err != nil || strings.HasPrefix(msg, "stderr:") {
+		logger.Warnf("DumpUPF err: %s => %s", msg, err.Error())
+		return "", "", err
+	}
+	if strings.Contains(msg, "Unable to connect to remote host") {
+		return "", "", fmt.Errorf("connection refused")
+	}
+	// 以off结尾是停止抓包，不需要写文件
+	if strings.HasSuffix(pcapCmd, "off") {
+		if strings.Contains(msg, "Write ") {
+			lastTmpIndex := strings.LastIndex(msg, "/tmp/")
+			text := msg[lastTmpIndex+5:]
+			extensionIndex := strings.LastIndex(text, ".pcap")
+			if extensionIndex != -1 {
+				fileName = text[:extensionIndex]
+			}
+		} else {
+			fileName = ""
+		}
+	}
+	return fileName, msg, err
 }

src/modules/trace/trace.go

@@ -16,20 +16,20 @@ func Setup(router *gin.Engine) {
 	// 信令抓包
 	tcpdumpGroup := router.Group("/tcpdump")
 	{
-		tcpdumpGroup.POST("/ne",
+		tcpdumpGroup.POST("/start",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_OTHER)),
-			controller.NewTcpdump.NeTask,
+			controller.NewTcpdump.DumpStart,
 		)
-		tcpdumpGroup.POST("/neUPF",
+		tcpdumpGroup.POST("/stop",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_OTHER)),
-			controller.NewTcpdump.NeUPFTask,
+			controller.NewTcpdump.DumpStop,
 		)
-		tcpdumpGroup.POST("/download",
+		tcpdumpGroup.POST("/traceUPF",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_IMPORT)),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_OTHER)),
-			controller.NewTcpdump.Download,
+			controller.NewTcpdump.TraceUPF,
 		)
 	}
 }