archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wgengine/router/router_linux.go: fixed " route del failed" error (#756)

Browse Source 
* wgengine/router/router_linux.go: Switched `cidrDiff("addr")` and `cidrDiff("route")` order

Signed-off-by: Christina Wen <christina@tailscale.com>

Co-authored-by: Christina Wen <christina@tailscale.com>
reviewable/pr752/r2
Christina Wen 4 years ago committed by GitHub
parent 761fe19e5f
commit e862f90e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
wgengine/router/router_linux.go
Unescape Escape View File

@ -173,17 +173,17 @@ func (r *linuxRouter) Set(cfg *Config) error {
return err return err
} }
newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf) newRoutes, err := cidrDiff("route", r.routes, cfg.Routes, r.addRoute, r.delRoute, r.logf)
if err != nil { if err != nil {
return err return err
} }
r.addrs = newAddrs r.routes = newRoutes
newRoutes, err := cidrDiff("route", r.routes, cfg.Routes, r.addRoute, r.delRoute, r.logf) newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf)
if err != nil { if err != nil {
return err return err
} }
r.routes = newRoutes r.addrs = newAddrs
switch { switch {
case cfg.SNATSubnetRoutes == r.snatSubnetRoutes: case cfg.SNATSubnetRoutes == r.snatSubnetRoutes:

Write Preview
Loading…
Cancel
Save