TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-03 02:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: update for wgcfg changes

Browse Source 
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
This commit is contained in:
David Crawshaw
2020-02-19 10:32:25 -05:00
parent c4f6f622f0
commit d0f697ee07
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wgengine/userspace.go
View File

@@ -237,15 +237,15 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, dnsDomains []string) error
return err
}
if err := e.magicConn.SetPrivateKey(cfg.Interface.PrivateKey); err != nil {
if err := e.magicConn.SetPrivateKey(cfg.PrivateKey); err != nil {
e.logf("magicsock: %v\n", err)
}
// TODO(apenwarr): only handling the first local address.
// Currently we never use more than one anyway.
var cidr wgcfg.CIDR
if len(cfg.Interface.Addresses) > 0 {
cidr = cfg.Interface.Addresses[0]
if len(cfg.Addresses) > 0 {
cidr = cfg.Addresses[0]
// TODO(apenwarr): this shouldn't be hardcoded in the client
cidr.Mask = 10 // route the whole cgnat range
}
@@ -253,7 +253,7 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, dnsDomains []string) error
rs := RouteSettings{
LocalAddr: cidr,
Cfg: cfg,
DNS: cfg.Interface.Dns,
DNS: cfg.DNS,
DNSDomains: dnsDomains,
}
e.logf("Reconfiguring router. la=%v dns=%v dom=%v\n",