fixup! chore: get TUN/DNS working on Windows for CoderVPN

deansheather · deansheather · commit e91ba82dc2e7 · 2025-01-29T18:58:07.000+11:00
diff --git a/go.mod b/go.mod
@@ -423,7 +423,7 @@ require (
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect
 	golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
diff --git a/vpn/tun.go b/vpn/tun.go
@@ -5,6 +5,6 @@ package vpn
 import "cdr.dev/slog"
 
 // This is a no-op on every platform except Darwin and Windows.
-func GetNetworkingStack(t *Tunnel, req *StartRequest, logger slog.Logger) (NetworkStack, error) {
+func GetNetworkingStack(_ *Tunnel, _ *StartRequest, _ slog.Logger) (NetworkStack, error) {
 	return NetworkStack{}, nil
 }
diff --git a/vpn/tun_windows.go b/vpn/tun_windows.go
@@ -95,7 +95,7 @@ func windowsUptime() time.Duration {
 }
 
 // TODO(@dean): implement a way to install/uninstall the wintun driver, most
-//              likely as a CLI command
+// likely as a CLI command
 //
 // This is taken from Tailscale:
 // https://github.com/tailscale/tailscale/blob/3abfbf50aebbe3ba57dc749165edb56be6715c0a/cmd/tailscaled/tailscaled_windows.go#L543
diff --git a/vpn/tunnel.go b/vpn/tunnel.go
@@ -233,13 +233,14 @@ func (t *Tunnel) start(req *StartRequest) error {
 	for _, h := range req.GetHeaders() {
 		header.Add(h.GetName(), h.GetValue())
 	}
-	if t.networkingStackFn == nil {
-		return xerrors.New("dev error: missing networking stack function")
-	}
-
-	networkingStack, err := t.networkingStackFn(t, req, t.clientLogger)
-	if err != nil {
-		return xerrors.Errorf("failed to create networking stack dependencies: %w", err)
+	var networkingStack NetworkStack
+	if t.networkingStackFn != nil {
+		networkingStack, err = t.networkingStackFn(t, req, t.clientLogger)
+		if err != nil {
+			return xerrors.Errorf("failed to create networking stack dependencies: %w", err)
+		}
+	} else {
+		t.logger.Debug(t.ctx, "using default networking stack as no custom stack was provided")
 	}
 
 	conn, err := t.client.NewConn(

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ package vpn`
`5`	`5`	`import "cdr.dev/slog"`
`6`	`6`
`7`	`7`	`// This is a no-op on every platform except Darwin and Windows.`
`8`		`-func GetNetworkingStack(t Tunnel, req StartRequest, logger slog.Logger) (NetworkStack, error) {`
	`8`	`+func GetNetworkingStack(_ Tunnel, _ StartRequest, _ slog.Logger) (NetworkStack, error) {`
`9`	`9`	`return NetworkStack{}, nil`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func windowsUptime() time.Duration {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// TODO(@dean): implement a way to install/uninstall the wintun driver, most`
`98`		`-// likely as a CLI command`
	`98`	`+// likely as a CLI command`
`99`	`99`	`//`
`100`	`100`	`// This is taken from Tailscale:`
`101`	`101`	`// https://github.com/tailscale/tailscale/blob/3abfbf50aebbe3ba57dc749165edb56be6715c0a/cmd/tailscaled/tailscaled_windows.go#L543`