test

ethanndickson · ethanndickson · commit 42434e7618bc · 2025-01-27T08:49:45.000Z
diff --git a/vpn/router.go b/vpn/router.go
@@ -5,6 +5,8 @@ import (
 	"net/netip"
 
 	"tailscale.com/wgengine/router"
+
+	"github.com/coder/coder/v2/coderd/util/ptr"
 )
 
 func NewRouter(t *Tunnel) router.Router {
@@ -70,7 +72,7 @@ func convertRouterConfig(cfg *router.Config) *NetworkSettingsRequest {
 	}
 
 	return &NetworkSettingsRequest{
-		Mtu: uint32(cfg.NewMTU),
+		Mtu: ptr.Ref(uint32(cfg.NewMTU)),
 		Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{
 			Addrs:          v4LocalAddrs,
 			IncludedRoutes: v4Routes,
@@ -81,8 +83,8 @@ func convertRouterConfig(cfg *router.Config) *NetworkSettingsRequest {
 			IncludedRoutes: v6Routes,
 			ExcludedRoutes: v6ExcludedRoutes,
 		},
-		TunnelOverheadBytes: 0,  // N/A
-		TunnelRemoteAddress: "", // N/A
+		TunnelOverheadBytes: nil, // N/A
+		TunnelRemoteAddress: nil, // N/A
 	}
 }
 
diff --git a/vpn/router_internal_test.go b/vpn/router_internal_test.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"tailscale.com/wgengine/router"
+
+	"github.com/coder/coder/v2/coderd/util/ptr"
 )
 
 func TestConvertRouterConfig(t *testing.T) {
@@ -25,7 +27,7 @@ func TestConvertRouterConfig(t *testing.T) {
 				NewMTU:      1500,
 			},
 			expected: &NetworkSettingsRequest{
-				Mtu: 1500,
+				Mtu: ptr.Ref(uint32(1500)),
 				Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{
 					Addrs: []string{"100.64.0.1/32"},
 					IncludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{
@@ -62,6 +64,11 @@ func TestConvertRouterConfig(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:     "Nil",
+			cfg:      nil,
+			expected: &NetworkSettingsRequest{},
+		},
 	}
 	//nolint:paralleltest // outdated rule
 	for _, tt := range tests {
diff --git a/vpn/tunnel_internal_test.go b/vpn/tunnel_internal_test.go
@@ -16,6 +16,7 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"tailscale.com/util/dnsname"
 
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/tailnet"
 	"github.com/coder/coder/v2/tailnet/proto"
 	"github.com/coder/coder/v2/testutil"
@@ -245,7 +246,7 @@ func TestTunnel_NetworkSettings(t *testing.T) {
 	// When: we inform the tunnel of network settings
 	go func() {
 		err := tun.ApplyNetworkSettings(ctx, &NetworkSettingsRequest{
-			Mtu: 1200,
+			Mtu: ptr.Ref(uint32(1200)),
 		})
 		errCh <- err
 	}()
@@ -317,12 +318,8 @@ func TestUpdater_createPeerUpdate(t *testing.T) {
 		},
 	})
 	require.Len(t, update.UpsertedAgents, 1)
-	slices.SortFunc(update.UpsertedAgents[0].Fqdn, func(a, b string) int {
-		return strings.Compare(a, b)
-	})
-	slices.SortFunc(update.DeletedAgents[0].Fqdn, func(a, b string) int {
-		return strings.Compare(a, b)
-	})
+	slices.SortFunc(update.UpsertedAgents[0].Fqdn, strings.Compare)
+	slices.SortFunc(update.DeletedAgents[0].Fqdn, strings.Compare)
 	require.Equal(t, update, &PeerUpdate{
 		UpsertedWorkspaces: []*Workspace{
 			{Id: w1ID[:], Name: "w1", Status: Workspace_Status(proto.Workspace_STARTING)},
diff --git a/vpn/vpn.proto b/vpn/vpn.proto
@@ -117,6 +117,7 @@ message Agent {
 // macOS.  It is a request/response message with response NetworkSettingsResponse
 message NetworkSettingsRequest {
 	optional uint32 tunnel_overhead_bytes = 1;
+	// If zero, the MTU is unchanged. If null, it should be reset.
 	optional uint32 mtu = 2;
 
 	message DNSSettings {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ import (`
`5`	`5`	`"net/netip"`
`6`	`6`
`7`	`7`	`"tailscale.com/wgengine/router"`
	`8`	`+`
	`9`	`+ "github.com/coder/coder/v2/coderd/util/ptr"`
`8`	`10`	`)`
`9`	`11`
`10`	`12`	`func NewRouter(t *Tunnel) router.Router {`
`@@ -70,7 +72,7 @@ func convertRouterConfig(cfg router.Config) NetworkSettingsRequest {`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`return &NetworkSettingsRequest{`
`73`		`- Mtu: uint32(cfg.NewMTU),`
	`75`	`+ Mtu: ptr.Ref(uint32(cfg.NewMTU)),`
`74`	`76`	`Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{`
`75`	`77`	`Addrs: v4LocalAddrs,`
`76`	`78`	`IncludedRoutes: v4Routes,`
`@@ -81,8 +83,8 @@ func convertRouterConfig(cfg router.Config) NetworkSettingsRequest {`
`81`	`83`	`IncludedRoutes: v6Routes,`
`82`	`84`	`ExcludedRoutes: v6ExcludedRoutes,`
`83`	`85`	`},`
`84`		`- TunnelOverheadBytes: 0, // N/A`
`85`		`- TunnelRemoteAddress: "", // N/A`
	`86`	`+ TunnelOverheadBytes: nil, // N/A`
	`87`	`+ TunnelRemoteAddress: nil, // N/A`
`86`	`88`	`}`
`87`	`89`	`}`
`88`	`90`