TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-29 04:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

--advertise-routes option enabled in Mac tailscale CLI; it checks for IP forwarding enabled

Browse Source 
Signed-off-by: Mike Kramlich <groglogic@gmail.com>
This commit is contained in:
Mike Kramlich 2020-08-03 11:26:07 -06:00 committed by Brad Fitzpatrick
parent 4987a7d46c
commit 08949d4ef1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/tailscale/cli/up.go
View File

@ -20,6 +20,7 @@ import (
"github.com/tailscale/wireguard-go/wgcfg" "github.com/tailscale/wireguard-go/wgcfg"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/version"
"tailscale.com/wgengine/router" "tailscale.com/wgengine/router"
) )
@ -55,7 +56,7 @@ specify any flags, options are reset to their default.
upf.StringVar(&upArgs.authKey, "authkey", "", "node authorization key") upf.StringVar(&upArgs.authKey, "authkey", "", "node authorization key")
upf.StringVar(&upArgs.hostname, "hostname", "", "hostname to use instead of the one provided by the OS") upf.StringVar(&upArgs.hostname, "hostname", "", "hostname to use instead of the one provided by the OS")
upf.BoolVar(&upArgs.enableDERP, "enable-derp", true, "enable the use of DERP servers") upf.BoolVar(&upArgs.enableDERP, "enable-derp", true, "enable the use of DERP servers")
if runtime.GOOS == "linux" || isBSD(runtime.GOOS) { if runtime.GOOS == "linux" || isBSD(runtime.GOOS) || version.OS() == "macOS" {
upf.StringVar(&upArgs.advertiseRoutes, "advertise-routes", "", "routes to advertise to other nodes (comma-separated, e.g. 10.0.0.0/8,192.168.0.0/24)") upf.StringVar(&upArgs.advertiseRoutes, "advertise-routes", "", "routes to advertise to other nodes (comma-separated, e.g. 10.0.0.0/8,192.168.0.0/24)")
} }
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
@ -113,14 +114,14 @@ func warning(format string, args ...interface{}) {
fmt.Printf("Warning: "+format+"\n", args...) fmt.Printf("Warning: "+format+"\n", args...)
} }
// checkIPForwarding prints warnings on linux if IP forwarding is not // checkIPForwarding prints warnings if IP forwarding is not
// enabled, or if we were unable to verify the state of IP forwarding. // enabled, or if we were unable to verify the state of IP forwarding.
func checkIPForwarding() { func checkIPForwarding() {
var key string var key string
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
key = "net.ipv4.ip_forward" key = "net.ipv4.ip_forward"
} else if isBSD(runtime.GOOS) { } else if isBSD(runtime.GOOS) || version.OS() == "macOS" {
key = "net.inet.ip.forwarding" key = "net.inet.ip.forwarding"
} else { } else {
return return