fix(capture/subprogram): Fix capture by process via run target program (

#166) * fix(subprogram): Fix capture by process via run target program * fix test
mozillazg · Oct 19, 2024 · 2cb31ff · 2cb31ff
1 parent c3a5bca
commit 2cb31ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/cmd/capture.go b/cmd/capture.go
@@ -53,6 +53,7 @@ func capture(ctx context.Context, stopFunc context.CancelFunc, opts *Options) er
 
 	log.Info("start get current connections")
 	conns := getCurrentConnects(ctx, pcache, opts)
+	log.Infof("got %d connections", len(conns))
 
 	copts := opts.ToCapturerOptions()
 	copts.Connections = conns
@@ -155,6 +156,10 @@ func getCurrentConnects(ctx context.Context, pcache *metadata.ProcessCache, opts
 	var pids []int
 	var filterPid bool
 
+	if len(opts.subProgArgs) > 0 {
+		return nil
+	}
+
 	if len(opts.pids) > 0 {
 		filterPid = true
 		for _, pid := range opts.pids {

diff --git a/internal/capturer/capturer.go b/internal/capturer/capturer.go
@@ -124,6 +124,7 @@ func (c *Capturer) StartSubProcessLoader(ctx context.Context, program string, su
 	if err != nil {
 		return err
 	}
+	log.Infof("will filter by pid: %d", c.subProcessLoaderPid)
 	c.opts.Pids = []uint{uint(c.subProcessLoaderPid)}
 	c.opts.FollowForks = true
 

diff --git a/internal/utils/exec.go b/internal/utils/exec.go
@@ -57,6 +57,7 @@ func StartSubProcess(ctx context.Context, Args []string) error {
 	if err := cmd.Start(); err != nil {
 		return err
 	}
+	log.Infof("started sub program, his pid is %d", cmd.Process.Pid)
 
 	if err := cmd.Wait(); err != nil {
 		return err

diff --git a/testdata/test_sub_program.sh b/testdata/test_sub_program.sh
@@ -10,7 +10,7 @@ RNAME="${FILE_PREFIX}_sub_program.read.txt"
 
 
 function test_ptcpdump() {
-  timeout 30s ${CMD} -i any -v --print -w "${FNAME}" \
+  timeout 30s ${CMD} -c 10 -i any -v --print -w "${FNAME}" \
 	  -- curl -m 10 1.1.1.1 | tee "${LNAME}"
 
   cat "${LNAME}"