mirror of
https://github.com/tailscale/tailscale.git
synced 2024-12-04 23:45:34 +00:00
2b4140ee46
The iOS and macOS networking extension API only exposes a single setter for the entire routing and DNS configuration, and does not appear to do any kind of diffing or deltas when applying changes. This results in spurious "network changed" errors in Chrome, even when the `OneCGNATRoute` flag fromdf9ce972c7
is used (because we're setting the same configuration repeatedly). Since we already keep track of the current routing and DNS configuration in CallbackRouter, use that to detect if they're actually changing, and only invoke the platform setter if it's actually necessary. Updates #3102 Signed-off-by: Mihai Parparita <mihai@tailscale.com> (cherry picked from commit06aa141632
)
75 lines
2.0 KiB
Go
75 lines
2.0 KiB
Go
// Copyright (c) 2021 Tailscale Inc & AUTHORS All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package router
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"tailscale.com/net/dns"
|
|
)
|
|
|
|
// CallbackRouter is an implementation of both Router and dns.OSConfigurator.
|
|
// When either network or DNS settings are changed, SetBoth is called with both configs.
|
|
// Mainly used as a shim for OSes that want to set both network and
|
|
// DNS configuration simultaneously (Mac, iOS, Android).
|
|
type CallbackRouter struct {
|
|
SetBoth func(rcfg *Config, dcfg *dns.OSConfig) error
|
|
SplitDNS bool
|
|
|
|
// GetBaseConfigFunc optionally specifies a function to return the current DNS
|
|
// config in response to GetBaseConfig.
|
|
//
|
|
// If nil, reading the current config isn't supported and GetBaseConfig()
|
|
// will return ErrGetBaseConfigNotSupported.
|
|
GetBaseConfigFunc func() (dns.OSConfig, error)
|
|
|
|
mu sync.Mutex // protects all the following
|
|
rcfg *Config // last applied router config
|
|
dcfg *dns.OSConfig // last applied DNS config
|
|
}
|
|
|
|
// Up implements Router.
|
|
func (r *CallbackRouter) Up() error {
|
|
return nil // TODO: check that all callers have no need for initialization
|
|
}
|
|
|
|
// Set implements Router.
|
|
func (r *CallbackRouter) Set(rcfg *Config) error {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
if r.rcfg.Equal(rcfg) {
|
|
return nil
|
|
}
|
|
r.rcfg = rcfg
|
|
return r.SetBoth(r.rcfg, r.dcfg)
|
|
}
|
|
|
|
// SetDNS implements dns.OSConfigurator.
|
|
func (r *CallbackRouter) SetDNS(dcfg dns.OSConfig) error {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
if r.dcfg != nil && r.dcfg.Equal(dcfg) {
|
|
return nil
|
|
}
|
|
r.dcfg = &dcfg
|
|
return r.SetBoth(r.rcfg, r.dcfg)
|
|
}
|
|
|
|
// SupportsSplitDNS implements dns.OSConfigurator.
|
|
func (r *CallbackRouter) SupportsSplitDNS() bool {
|
|
return r.SplitDNS
|
|
}
|
|
|
|
func (r *CallbackRouter) GetBaseConfig() (dns.OSConfig, error) {
|
|
if r.GetBaseConfigFunc == nil {
|
|
return dns.OSConfig{}, dns.ErrGetBaseConfigNotSupported
|
|
}
|
|
return r.GetBaseConfigFunc()
|
|
}
|
|
|
|
func (r *CallbackRouter) Close() error {
|
|
return r.SetBoth(nil, nil) // TODO: check if makes sense
|
|
}
|