TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 20:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netns: also don't err on tailscaled -fake as a regular user

Browse Source 
That's one of my dev workflows.
This commit is contained in:
Brad Fitzpatrick 2020-05-29 22:40:26 -07:00
parent 7f68e097dd
commit 765695eaa2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/netns/netns_linux.go
View File

@ -38,13 +38,24 @@ func control(network, address string, c syscall.RawConn) error {
err := c.Control(func(fd uintptr) { err := c.Control(func(fd uintptr) {
controlErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_MARK, tailscaleBypassMark) controlErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_MARK, tailscaleBypassMark)
}) })
// Before returning some fatal error, see if we're just a regular user // Before returning some fatal error, skip it in some cases.
// running cmd/tailscale (presumably netcheck) and ignore the error if so.
if (err != nil || controlErr != nil) && os.Getuid() != 0 { if (err != nil || controlErr != nil) && os.Getuid() != 0 {
if v, _ := os.Executable(); filepath.Base(v) == "tailscale" { v, _ := os.Executable()
switch filepath.Base(v) {
case "tailscale":
for _, arg := range os.Args {
if arg == "netcheck" {
return nil return nil
} }
} }
case "tailscaled":
for _, arg := range os.Args {
if arg == "-fake" || arg == "--fake" {
return nil
}
}
}
}
if err != nil { if err != nil {
return fmt.Errorf("setting socket mark: %w", err) return fmt.Errorf("setting socket mark: %w", err)
} }