TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-01 09:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: rename uflags, give it a type, remove dead code

Browse Source
This commit is contained in:
Brad Fitzpatrick
2020-07-23 08:38:14 -07:00
parent 32ecdea157
commit 3b0514ef6d
2 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipn/local.go
View File

@@ -832,20 +832,20 @@ func (b *LocalBackend) authReconfig() {
return
}
uflags := controlclient.UDefault
var flags controlclient.WGConfigFlags
if uc.RouteAll {
uflags |= controlclient.UAllowDefaultRoute
flags |= controlclient.AllowDefaultRoute
// TODO(apenwarr): Make subnet routes a different pref?
uflags |= controlclient.UAllowSubnetRoutes
flags |= controlclient.AllowSubnetRoutes
// TODO(apenwarr): Remove this once we sort out subnet routes.
// Right now default routes are broken in Windows, but
// controlclient doesn't properly send subnet routes. So
// let's convert a default route into a subnet route in order
// to allow experimentation.
uflags |= controlclient.UHackDefaultRoute
flags |= controlclient.HackDefaultRoute
}
if uc.AllowSingleHosts {
uflags |= controlclient.UAllowSingleHosts
flags |= controlclient.AllowSingleHosts
}
dns := nm.DNS
@@ -854,7 +854,7 @@ func (b *LocalBackend) authReconfig() {
dns = []wgcfg.IP{}
dom = []string{}
}
cfg, err := nm.WGCfg(b.logf, uflags, dns)
cfg, err := nm.WGCfg(b.logf, flags, dns)
if err != nil {
b.logf("wgcfg: %v", err)
return
@@ -864,7 +864,7 @@ func (b *LocalBackend) authReconfig() {
if err == wgengine.ErrNoChanges {
return
}
b.logf("authReconfig: ra=%v dns=%v 0x%02x: %v", uc.RouteAll, uc.CorpDNS, uflags, err)
b.logf("authReconfig: ra=%v dns=%v 0x%02x: %v", uc.RouteAll, uc.CorpDNS, flags, err)
}
// routerConfig produces a router.Config from a wireguard config,