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

cmd/tailscale: support IPs or CIDRs in -advertise-routes.

Browse Source 
Fixes #370.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-05-11 01:47:37 +00:00
parent 21ac65d3da
commit ad1cfe8bbe
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/tailscale/tailscale.go
View File

@ -105,6 +105,29 @@ var upArgs struct {
authKey string authKey string
} }
// parseIPOrCIDR parses an IP address or a CIDR prefix. If the input
// is an IP address, it is returned in CIDR form with a /32 mask for
// IPv4 or a /128 mask for IPv6.
func parseIPOrCIDR(s string) (wgcfg.CIDR, bool) {
if strings.Contains(s, "/") {
ret, err := wgcfg.ParseCIDR(s)
if err != nil {
return wgcfg.CIDR{}, false
}
return ret, true
}
ip, ok := wgcfg.ParseIP(s)
if !ok {
return wgcfg.CIDR{}, false
}
if ip.Is4() {
return wgcfg.CIDR{ip, 32}, true
} else {
return wgcfg.CIDR{ip, 128}, true
}
}
func runUp(ctx context.Context, args []string) error { func runUp(ctx context.Context, args []string) error {
if len(args) > 0 { if len(args) > 0 {
log.Fatalf("too many non-flag arguments: %q", args) log.Fatalf("too many non-flag arguments: %q", args)
@ -114,9 +137,9 @@ func runUp(ctx context.Context, args []string) error {
if upArgs.advertiseRoutes != "" { if upArgs.advertiseRoutes != "" {
advroutes := strings.Split(upArgs.advertiseRoutes, ",") advroutes := strings.Split(upArgs.advertiseRoutes, ",")
for _, s := range advroutes { for _, s := range advroutes {
cidr, err := wgcfg.ParseCIDR(s) cidr, ok := parseIPOrCIDR(s)
if err != nil { if !ok {
log.Fatalf("%q is not a valid CIDR prefix: %v", s, err) log.Fatalf("%q is not a valid IP address or CIDR prefix", s)
} }
routes = append(routes, cidr) routes = append(routes, cidr)
} }