TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: factor out tailscaleIPFromArg from ping command

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-03-29 21:29:27 -07:00
parent 41e4e02e57
commit eeacf84dae
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cmd/tailscale/cli/ping.go
View File

@ -83,37 +83,11 @@ func runPing(ctx context.Context, args []string) error {
go pump(ctx, bc, c) go pump(ctx, bc, c)
hostOrIP := args[0] hostOrIP := args[0]
ip, err := tailscaleIPFromArg(ctx, hostOrIP)
// If the argument is an IP address, use it directly without any resolution. if err != nil {
if net.ParseIP(hostOrIP) != nil { return err
ip = hostOrIP
} }
// Otherwise, try to resolve it first from the network peer list.
if ip == "" {
st, err := tailscale.Status(ctx)
if err != nil {
return err
}
for _, ps := range st.Peer {
if hostOrIP == dnsOrQuoteHostname(st, ps) || hostOrIP == ps.DNSName {
ip = ps.TailAddr
break
}
}
}
// Finally, use DNS.
if ip == "" {
var res net.Resolver
if addrs, err := res.LookupHost(ctx, hostOrIP); err != nil {
return fmt.Errorf("error looking up IP of %q: %v", hostOrIP, err)
} else if len(addrs) == 0 {
return fmt.Errorf("no IPs found for %q", hostOrIP)
} else {
ip = addrs[0]
}
}
if pingArgs.verbose && ip != hostOrIP { if pingArgs.verbose && ip != hostOrIP {
log.Printf("lookup %q => %q", hostOrIP, ip) log.Printf("lookup %q => %q", hostOrIP, ip)
} }
@ -166,3 +140,31 @@ func runPing(ctx context.Context, args []string) error {
} }
} }
} }
func tailscaleIPFromArg(ctx context.Context, hostOrIP string) (ip string, err error) {
// If the argument is an IP address, use it directly without any resolution.
if net.ParseIP(hostOrIP) != nil {
return hostOrIP, nil
}
// Otherwise, try to resolve it first from the network peer list.
st, err := tailscale.Status(ctx)
if err != nil {
return "", err
}
for _, ps := range st.Peer {
if hostOrIP == dnsOrQuoteHostname(st, ps) || hostOrIP == ps.DNSName {
return ps.TailAddr, nil
}
}
// Finally, use DNS.
var res net.Resolver
if addrs, err := res.LookupHost(ctx, hostOrIP); err != nil {
return "", fmt.Errorf("error looking up IP of %q: %v", hostOrIP, err)
} else if len(addrs) == 0 {
return "", fmt.Errorf("no IPs found for %q", hostOrIP)
} else {
return addrs[0], nil
}
}