TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/interfaces: sort returned addresses from LocalAddresses

Browse Source 
Also change the type to netaddr.IP while here, because it made sorting
easier.

Updates tailscale/corp#1397

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-03-03 22:02:45 -08:00 committed by Brad Fitzpatrick
parent ad6edf5ecd
commit 829eb8363a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/interfaces/interfaces.go
View File

@ -78,7 +78,7 @@ func isProblematicInterface(nif *net.Interface) bool {
// LocalAddresses returns the machine's IP addresses, separated by // LocalAddresses returns the machine's IP addresses, separated by
// whether they're loopback addresses. // whether they're loopback addresses.
func LocalAddresses() (regular, loopback []string, err error) { func LocalAddresses() (regular, loopback []netaddr.IP, err error) {
// TODO(crawshaw): don't serve interface addresses that we are routing // TODO(crawshaw): don't serve interface addresses that we are routing
ifaces, err := net.Interfaces() ifaces, err := net.Interfaces()
if err != nil { if err != nil {
@ -117,16 +117,22 @@ func LocalAddresses() (regular, loopback []string, err error) {
continue continue
} }
if ip.IsLoopback() || ifcIsLoopback { if ip.IsLoopback() || ifcIsLoopback {
loopback = append(loopback, ip.String()) loopback = append(loopback, ip)
} else { } else {
regular = append(regular, ip.String()) regular = append(regular, ip)
} }
} }
} }
} }
sortIPs(regular)
sortIPs(loopback)
return regular, loopback, nil return regular, loopback, nil
} }
func sortIPs(s []netaddr.IP) {
sort.Slice(s, func(i, j int) bool { return s[i].Less(s[j]) })
}
// Interface is a wrapper around Go's net.Interface with some extra methods. // Interface is a wrapper around Go's net.Interface with some extra methods.
type Interface struct { type Interface struct {
*net.Interface *net.Interface

4
wgengine/magicsock/magicsock.go
View File

@ -1055,8 +1055,8 @@ func (c *Conn) determineEndpoints(ctx context.Context) (ipPorts []string, reason
ips = loopback ips = loopback
reason = "loopback" reason = "loopback"
} }
for _, ipStr := range ips { for _, ip := range ips {
addAddr(net.JoinHostPort(ipStr, fmt.Sprint(localAddr.Port)), reason) addAddr(netaddr.IPPort{IP: ip, Port: uint16(localAddr.Port)}.String(), reason)
} }
} else { } else {
// Our local endpoint is bound to a particular address. // Our local endpoint is bound to a particular address.