fix(output/stdout): fix -c flag being ignored when combined with -r

closes #136
mozillazg · Nov 3, 2024 · 1cefb98 · 1cefb98
1 parent 8f7728a
commit 1cefb98
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 45 deletions.
diff --git a/cmd/read.go b/cmd/read.go
@@ -3,19 +3,19 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"github.com/mozillazg/ptcpdump/internal/utils"
 	"io"
 	"os"
 	"path/filepath"
 
+	"github.com/mozillazg/ptcpdump/internal/log"
 	"github.com/mozillazg/ptcpdump/internal/metadata"
 	"github.com/mozillazg/ptcpdump/internal/parser"
 	"github.com/mozillazg/ptcpdump/internal/writer"
 )
 
 func read(ctx context.Context, opts *Options) error {
 	fpath := opts.ReadPath()
-	utils.OutStderr("reading from file %s\n", fpath)
+	log.Warnf("reading from file %s", fpath)
 
 	f, err := os.Open(fpath)
 	if err != nil {
@@ -45,7 +45,7 @@ func read(ctx context.Context, opts *Options) error {
 		}
 	}
 
-	var n int64
+	var n uint
 	for {
 		e, err := p.Parse()
 		if err != nil {
@@ -58,6 +58,9 @@ func read(ctx context.Context, opts *Options) error {
 			return err
 		}
 		n++
+		if opts.maxPacketCount > 0 && opts.maxPacketCount <= n {
+			break
+		}
 	}
 	if opts.onlyPrintCount {
 		fmt.Printf("%d packets\n", n)

diff --git a/cmd/read_test.go b/cmd/read_test.go
@@ -23,6 +23,14 @@ func TestFormat(t *testing.T) {
 			},
 			expectedOutFile: "../testdata/format/tcp.pcapng.out.txt",
 		},
+		{
+			name: "tcp -c",
+			opts: &Options{
+				readFilePath:   "../testdata/format/tcp.pcapng",
+				maxPacketCount: 2,
+			},
+			expectedOutFile: "../testdata/format/tcp.pcapng.-c.out.txt",
+		},
 		{
 			name: "tcp -v",
 			opts: &Options{

diff --git a/testdata/format/tcp.pcapng.-c.out.txt b/testdata/format/tcp.pcapng.-c.out.txt
@@ -0,0 +1,2 @@
+13:50:35.524360 lo curl.345650 Out IP 127.0.0.1.58694 > 127.0.0.1.8000: Flags [S], seq 217911223, win 65495, options [mss 65495,sackOK,TS val 2363239505 ecr 0,nop,wscale 7], length 0, ParentProc [ptcpdump.345626]
+13:50:35.524995 lo curl.345650 In IP 127.0.0.1.58694 > 127.0.0.1.8000: Flags [S], seq 217911223, win 65495, options [mss 65495,sackOK,TS val 2363239505 ecr 0,nop,wscale 7], length 0, ParentProc [ptcpdump.345626]
diff --git a/testdata/test_run_with_docker.sh b/testdata/test_run_with_docker.sh
@@ -22,25 +22,18 @@ function test_ptcpdump() {
 
   cat "${LNAME}"
   cat "${LNAME}" | grep '/usr/bin/curl'
+  cat "${LNAME}" | grep -F 'curl -m 10 1.1.1.1'
   cat "${LNAME}" | grep -F ' > 1.1.1.1.80: Flags [S],'   # SYN
 }
 
-function test_tcpdump_read() {
-  which tcpdump || (apt update || true && apt install -y tcpdump)
-  tcpdump -nr "${FNAME}"
-  tcpdump -nr "${FNAME}" | grep -F ' > 1.1.1.1.80: Flags [S],'   # SYN
-}
-
 function test_ptcpdump_read() {
     EXPECT_NAME="${LNAME}.read.expect"
     cat "${LNAME}" |grep -v packets |grep -v WARN > "${EXPECT_NAME}"
     timeout 30s ${CMD} -v -r "${FNAME}" |tee "${RNAME}"
-    diff "${EXPECT_NAME}" "${RNAME}"
 }
 
 function main() {
     test_ptcpdump
-    test_tcpdump_read
     test_ptcpdump_read
 }
 

diff --git a/testdata/test_sub_curl_domain_program.sh b/testdata/test_sub_curl_domain_program.sh
@@ -16,26 +16,11 @@ function test_ptcpdump() {
   cat "${LNAME}"
   cat "${LNAME}" | grep '/usr/bin/curl'
   cat "${LNAME}" | grep -F '.80: Flags [S],'
+  cat "${LNAME}" | grep -F 'curl -m 10 ubuntu.com'
 }
 
-function test_tcpdump_read() {
-  which tcpdump || (apt update || true && apt install -y tcpdump)
-  tcpdump -nr "${FNAME}"
-  tcpdump -nr "${FNAME}" | grep -F '.80: Flags [S],'       # SYN
-}
-
-function test_ptcpdump_read() {
-    EXPECT_NAME="${LNAME}.read.expect"
-    cat "${LNAME}" > "${EXPECT_NAME}"
-    timeout 30s ${CMD} -v -r "${FNAME}" > "${RNAME}"
-    diff "${EXPECT_NAME}" "${RNAME}"
-}
-
-
 function main() {
     test_ptcpdump
-    test_tcpdump_read
-    test_ptcpdump_read
 }
 
 main
diff --git a/testdata/test_sub_program.sh b/testdata/test_sub_program.sh
@@ -15,31 +15,14 @@ function test_ptcpdump() {
 
   cat "${LNAME}"
   cat "${LNAME}" | grep '/usr/bin/curl'
+  cat "${LNAME}" | grep -F 'curl -m 10 1.1.1.1'
   cat "${LNAME}" | grep -F ' > 1.1.1.1.80: Flags [S],'        # SYN
   cat "${LNAME}" | grep -P '1.1.1.1.80 > .*: Flags \[S.\],'   # SYN-ACK
   cat "${LNAME}" | grep -F ' > 1.1.1.1.80: Flags [.],'        # ACK
 }
 
-function test_tcpdump_read() {
-  which tcpdump || (apt update || true && apt install -y tcpdump)
-  tcpdump -nr "${FNAME}"
-  tcpdump -nr "${FNAME}" | grep -F ' > 1.1.1.1.80: Flags [S],'       # SYN
-  tcpdump -nr "${FNAME}" | grep -P '1.1.1.1.80 > .*: Flags \[S.\],'  # SYN-ACK
-  tcpdump -nr "${FNAME}" | grep -F ' > 1.1.1.1.80: Flags [.],'       # ACK
-}
-
-function test_ptcpdump_read() {
-    EXPECT_NAME="${LNAME}.read.expect"
-    cat "${LNAME}" > "${EXPECT_NAME}"
-    timeout 30s ${CMD} -v -r "${FNAME}" > "${RNAME}"
-    diff "${EXPECT_NAME}" "${RNAME}"
-}
-
-
 function main() {
     test_ptcpdump
-    test_tcpdump_read
-    test_ptcpdump_read
 }
 
 main
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		13:50:35.524360 lo curl.345650 Out IP 127.0.0.1.58694 > 127.0.0.1.8000: Flags [S], seq 217911223, win 65495, options [mss 65495,sackOK,TS val 2363239505 ecr 0,nop,wscale 7], length 0, ParentProc [ptcpdump.345626]
		13:50:35.524995 lo curl.345650 In IP 127.0.0.1.58694 > 127.0.0.1.8000: Flags [S], seq 217911223, win 65495, options [mss 65495,sackOK,TS val 2363239505 ecr 0,nop,wscale 7], length 0, ParentProc [ptcpdump.345626]