From 02d25def3c7b39d024904c36adfb5c8b3d1f3ada Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 26 Jan 2024 18:15:52 +0000
Subject: [PATCH 1/3] feat: add option to speedtest to dump a pcap of network
 traffic

---
 cli/speedtest.go | 23 +++++++++++++++++++++++
 tailnet/conn.go  |  7 +++++++
 2 files changed, 30 insertions(+)

diff --git a/cli/speedtest.go b/cli/speedtest.go
index a7734bf68a7af..ea4b820262739 100644
--- a/cli/speedtest.go
+++ b/cli/speedtest.go
@@ -3,11 +3,13 @@ package cli
 import (
 	"context"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/jedib0t/go-pretty/v6/table"
 	"golang.org/x/xerrors"
 	tsspeedtest "tailscale.com/net/speedtest"
+	"tailscale.com/wgengine/capture"
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/sloghuman"
@@ -21,6 +23,7 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
 		direct    bool
 		duration  time.Duration
 		direction string
+		pcapFile  string
 	)
 	client := new(codersdk.Client)
 	cmd := &clibase.Cmd{
@@ -63,6 +66,7 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
 				return err
 			}
 			defer conn.Close()
+
 			if direct {
 				ticker := time.NewTicker(time.Second)
 				defer ticker.Stop()
@@ -95,6 +99,19 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
 			} else {
 				conn.AwaitReachable(ctx)
 			}
+
+			if pcapFile != "" {
+				s := capture.New()
+				conn.InstallCaptureHook(s.LogPacket)
+				f, err := os.OpenFile(pcapFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				unregister := s.RegisterOutput(f)
+				defer unregister()
+			}
+
 			var tsDir tsspeedtest.Direction
 			switch direction {
 			case "up":
@@ -146,6 +163,12 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
 			Default:       tsspeedtest.DefaultDuration.String(),
 			Value:         clibase.DurationOf(&duration),
 		},
+		{
+			Description: "Specifies a file to write a network capture to.",
+			Flag:        "pcap-file",
+			Default:     "",
+			Value:       clibase.StringOf(&pcapFile),
+		},
 	}
 	return cmd
 }
diff --git a/tailnet/conn.go b/tailnet/conn.go
index b574df3e10d55..129567260f307 100644
--- a/tailnet/conn.go
+++ b/tailnet/conn.go
@@ -30,6 +30,7 @@ import (
 	tslogger "tailscale.com/types/logger"
 	"tailscale.com/types/netlogtype"
 	"tailscale.com/wgengine"
+	"tailscale.com/wgengine/capture"
 	"tailscale.com/wgengine/magicsock"
 	"tailscale.com/wgengine/netstack"
 	"tailscale.com/wgengine/router"
@@ -310,6 +311,12 @@ type Conn struct {
 	trafficStats *connstats.Statistics
 }
 
+func (c *Conn) InstallCaptureHook(f capture.Callback) {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+	c.wireguardEngine.InstallCaptureHook(f)
+}
+
 func (c *Conn) MagicsockSetDebugLoggingEnabled(enabled bool) {
 	c.magicConn.SetDebugLoggingEnabled(enabled)
 }

From 9a2a835fa2332d4b9ca8b15ebb5b7b6db7873f39 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 26 Jan 2024 18:18:23 +0000
Subject: [PATCH 2/3] fixup! feat: add option to speedtest to dump a pcap of
 network traffic

---
 docs/cli/speedtest.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/cli/speedtest.md b/docs/cli/speedtest.md
index 0a351fde5d9df..50f2a8ca72c1a 100644
--- a/docs/cli/speedtest.md
+++ b/docs/cli/speedtest.md
@@ -29,6 +29,14 @@ Specifies whether to wait for a direct connection before testing speed.
 
 Specifies whether to run in reverse mode where the client receives and the server sends.
 
+### --pcap-file
+
+|      |                     |
+| ---- | ------------------- |
+| Type | <code>string</code> |
+
+Specifies a file to write a network capture to.
+
 ### -t, --time
 
 |         |                       |

From 4d639604d464dbe78262d205a1b3e8f4c79b608d Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 26 Jan 2024 18:37:13 +0000
Subject: [PATCH 3/3] fixup! feat: add option to speedtest to dump a pcap of
 network traffic

---
 cli/speedtest.go                           | 2 +-
 cli/testdata/coder_speedtest_--help.golden | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/speedtest.go b/cli/speedtest.go
index ea4b820262739..11fcf807b4029 100644
--- a/cli/speedtest.go
+++ b/cli/speedtest.go
@@ -103,7 +103,7 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
 			if pcapFile != "" {
 				s := capture.New()
 				conn.InstallCaptureHook(s.LogPacket)
-				f, err := os.OpenFile(pcapFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+				f, err := os.OpenFile(pcapFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
 				if err != nil {
 					return err
 				}
diff --git a/cli/testdata/coder_speedtest_--help.golden b/cli/testdata/coder_speedtest_--help.golden
index 57c4c5237bfd6..60eb4026b1028 100644
--- a/cli/testdata/coder_speedtest_--help.golden
+++ b/cli/testdata/coder_speedtest_--help.golden
@@ -14,6 +14,9 @@ OPTIONS:
           Specifies whether to run in reverse mode where the client receives and
           the server sends.
 
+      --pcap-file string
+          Specifies a file to write a network capture to.
+
   -t, --time duration (default: 5s)
           Specifies the duration to monitor traffic.