TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-02 22:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: call checkPrefs in Start too

Browse Source 
We were not calling checkPrefs on `opts.*Prefs` in (*LocalBackend).Start().

Updates #713

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-11-22 04:11:44 +05:00 committed by Maisem Ali
parent 41dd49391f
commit 18c7c3981a
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipn/ipnlocal/local.go
View File

@ -1122,6 +1122,17 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
} }
b.mu.Lock() b.mu.Lock()
if opts.UpdatePrefs != nil {
if err := b.checkPrefsLocked(opts.UpdatePrefs); err != nil {
b.mu.Unlock()
return err
}
} else if opts.LegacyMigrationPrefs != nil {
if err := b.checkPrefsLocked(opts.LegacyMigrationPrefs); err != nil {
b.mu.Unlock()
return err
}
}
profileID := b.pm.CurrentProfile().ID profileID := b.pm.CurrentProfile().ID
// The iOS client sends a "Start" whenever its UI screen comes // The iOS client sends a "Start" whenever its UI screen comes

5
wgengine/netstack/netstack_test.go
View File

@ -272,6 +272,7 @@ func TestShouldProcessInbound(t *testing.T) {
pkt *packet.Parsed pkt *packet.Parsed
setup func(*Impl) setup func(*Impl)
want bool want bool
runOnGOOS string
}{ }{
{ {
name: "ipv6-via", name: "ipv6-via",
@ -350,6 +351,7 @@ func TestShouldProcessInbound(t *testing.T) {
}) })
}, },
want: true, want: true,
runOnGOOS: "linux",
}, },
{ {
name: "tailscale-ssh-disabled", name: "tailscale-ssh-disabled",
@ -443,6 +445,9 @@ func TestShouldProcessInbound(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
if tc.runOnGOOS != "" && runtime.GOOS != tc.runOnGOOS {
t.Skipf("skipping on GOOS=%v", runtime.GOOS)
}
impl := makeNetstack(t, func(i *Impl) { impl := makeNetstack(t, func(i *Impl) {
defer t.Logf("netstack setup finished") defer t.Logf("netstack setup finished")