Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e05884

Browse files
committed
test
1 parentbd1340a commit1e05884

File tree

6 files changed

+29
-15
lines changed

6 files changed

+29
-15
lines changed

‎vpn/dns.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package vpn
22

3-
import"tailscale.com/net/dns"
3+
import (
4+
"tailscale.com/net/dns"
5+
)
46

57
funcNewDNSConfigurator(t*Tunnel) dns.OSConfigurator {
68
return&dnsManager{tunnel:t}

‎vpn/router.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"net/netip"
66

77
"tailscale.com/wgengine/router"
8+
9+
"github.com/coder/coder/v2/coderd/util/ptr"
810
)
911

1012
funcNewRouter(t*Tunnel) router.Router {
@@ -70,7 +72,7 @@ func convertRouterConfig(cfg *router.Config) *NetworkSettingsRequest {
7072
}
7173

7274
return&NetworkSettingsRequest{
73-
Mtu:uint32(cfg.NewMTU),
75+
Mtu:ptr.Ref(uint32(cfg.NewMTU)),
7476
Ipv4Settings:&NetworkSettingsRequest_IPv4Settings{
7577
Addrs:v4LocalAddrs,
7678
IncludedRoutes:v4Routes,
@@ -81,8 +83,8 @@ func convertRouterConfig(cfg *router.Config) *NetworkSettingsRequest {
8183
IncludedRoutes:v6Routes,
8284
ExcludedRoutes:v6ExcludedRoutes,
8385
},
84-
TunnelOverheadBytes:0,// N/A
85-
TunnelRemoteAddress:"",// N/A
86+
TunnelOverheadBytes:nil,// N/A
87+
TunnelRemoteAddress:nil,// N/A
8688
}
8789
}
8890

‎vpn/router_internal_test.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66

77
"github.com/stretchr/testify/require"
88
"tailscale.com/wgengine/router"
9+
10+
"github.com/coder/coder/v2/coderd/util/ptr"
911
)
1012

1113
funcTestConvertRouterConfig(t*testing.T) {
@@ -25,7 +27,7 @@ func TestConvertRouterConfig(t *testing.T) {
2527
NewMTU:1500,
2628
},
2729
expected:&NetworkSettingsRequest{
28-
Mtu:1500,
30+
Mtu:ptr.Ref(uint32(1500)),
2931
Ipv4Settings:&NetworkSettingsRequest_IPv4Settings{
3032
Addrs: []string{"100.64.0.1/32"},
3133
IncludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{
@@ -60,8 +62,14 @@ func TestConvertRouterConfig(t *testing.T) {
6062
IncludedRoutes: []*NetworkSettingsRequest_IPv6Settings_IPv6Route{},
6163
ExcludedRoutes: []*NetworkSettingsRequest_IPv6Settings_IPv6Route{},
6264
},
65+
Mtu:ptr.Ref(uint32(0)),
6366
},
6467
},
68+
{
69+
name:"Nil",
70+
cfg:nil,
71+
expected:&NetworkSettingsRequest{},
72+
},
6573
}
6674
//nolint:paralleltest // outdated rule
6775
for_,tt:=rangetests {

‎vpn/tunnel_internal_test.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"google.golang.org/protobuf/types/known/timestamppb"
1717
"tailscale.com/util/dnsname"
1818

19+
"github.com/coder/coder/v2/coderd/util/ptr"
1920
"github.com/coder/coder/v2/tailnet"
2021
"github.com/coder/coder/v2/tailnet/proto"
2122
"github.com/coder/coder/v2/testutil"
@@ -245,14 +246,14 @@ func TestTunnel_NetworkSettings(t *testing.T) {
245246
// When: we inform the tunnel of network settings
246247
gofunc() {
247248
err:=tun.ApplyNetworkSettings(ctx,&NetworkSettingsRequest{
248-
Mtu:1200,
249+
Mtu:ptr.Ref(uint32(1200)),
249250
})
250251
errCh<-err
251252
}()
252253
// Then: the tunnel sends a NetworkSettings message
253254
req:=testutil.RequireRecvCtx(ctx,t,mgr.requests)
254255
require.NotNil(t,req.msg.Rpc)
255-
require.Equal(t,uint32(1200),req.msg.GetNetworkSettings().Mtu)
256+
require.Equal(t,ptr.Ref(uint32(1200)),req.msg.GetNetworkSettings().Mtu)
256257
gofunc() {
257258
testutil.RequireSendCtx(ctx,t,mgr.sendCh,&ManagerMessage{
258259
Rpc:&RPC{ResponseTo:req.msg.Rpc.MsgId},
@@ -317,12 +318,8 @@ func TestUpdater_createPeerUpdate(t *testing.T) {
317318
},
318319
})
319320
require.Len(t,update.UpsertedAgents,1)
320-
slices.SortFunc(update.UpsertedAgents[0].Fqdn,func(a,bstring)int {
321-
returnstrings.Compare(a,b)
322-
})
323-
slices.SortFunc(update.DeletedAgents[0].Fqdn,func(a,bstring)int {
324-
returnstrings.Compare(a,b)
325-
})
321+
slices.SortFunc(update.UpsertedAgents[0].Fqdn,strings.Compare)
322+
slices.SortFunc(update.DeletedAgents[0].Fqdn,strings.Compare)
326323
require.Equal(t,update,&PeerUpdate{
327324
UpsertedWorkspaces: []*Workspace{
328325
{Id:w1ID[:],Name:"w1",Status:Workspace_Status(proto.Workspace_STARTING)},

‎vpn/vpn.pb.go‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎vpn/vpn.proto‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ message Agent {
117117
// macOS. It is a request/response message with response NetworkSettingsResponse
118118
messageNetworkSettingsRequest {
119119
optionaluint32tunnel_overhead_bytes=1;
120+
// If zero, the MTU is unchanged. If null, it should be reset.
120121
optionaluint32mtu=2;
121122

122123
messageDNSSettings {
@@ -129,6 +130,8 @@ message NetworkSettingsRequest {
129130
// appended to the resolver’s list of search domains.
130131
boolmatch_domains_no_search=5;
131132
}
133+
134+
// If present, all other fields are unchanged, as this field is sent separately.
132135
DNSSettingsdns_settings=3;
133136

134137
optionalstringtunnel_remote_address=4;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp