Skip to content

Commit

Permalink
wgengine/router: ignore Linux ip route error adding dup route
Browse files Browse the repository at this point in the history
Updates #3060
Updates #391

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
  • Loading branch information
bradfitz committed Oct 14, 2021
1 parent ddf3394 commit 14f9c75
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 15 additions & 1 deletion wgengine/router/router_linux.go
Expand Up @@ -533,7 +533,21 @@ func (r *linuxRouter) addRouteDef(routeDef []string, cidr netaddr.IPPrefix) erro
if r.ipRuleAvailable {
args = append(args, "table", tailscaleRouteTable)
}
return r.cmd.run(args...)
err := r.cmd.run(args...)
if err == nil {
return nil
}

// TODO(bradfitz): remove this ugly hack to detect failure to
// add a route that already exists (as happens in when we're
// racing to add kernel-maintained routes when enabling exit
// nodes w/o Local LAN access, Issue 3060) and use netlink
// directly instead (Issue 391).
if errCode(err) == 2 && strings.Contains(err.Error(), "RTNETLINK answers: File exists") {
r.logf("ignoring route add of %v; already exists", cidr)
return nil
}
return err
}

// delRoute removes the route for cidr pointing to the tunnel
Expand Down
2 changes: 2 additions & 0 deletions wgengine/router/runner.go
Expand Up @@ -10,6 +10,7 @@ package router
import (
"errors"
"fmt"
"os"
"os/exec"
"strconv"
"strings"
Expand Down Expand Up @@ -68,6 +69,7 @@ func (o osCommandRunner) output(args ...string) ([]byte, error) {
}

cmd := exec.Command(args[0], args[1:]...)
cmd.Env = append(os.Environ(), "LC_ALL=C")
if o.ambientCapNetAdmin {
cmd.SysProcAttr = &syscall.SysProcAttr{
AmbientCaps: []uintptr{unix.CAP_NET_ADMIN},
Expand Down

0 comments on commit 14f9c75

Please sign in to comment.