myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Do not assume IPv4 during Tailscale node construction

Browse source
This commit is contained in:
Csaba Sarkadi 2021-10-31 16:05:48 +01:00
parent 46cdce00af
commit 7ec8346179
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
machine.go
View file

@ -470,16 +470,16 @@ func (machine Machine) toNode(
} }
addrs := []netaddr.IPPrefix{} addrs := []netaddr.IPPrefix{}
ip, err := netaddr.ParseIPPrefix(fmt.Sprintf("%s/32", machine.IPAddress)) nodeAddr, err := netaddr.ParseIP(m.IPAddresses)
if err != nil { if err != nil {
log.Trace(). log.Trace().
Caller(). Caller().
Str("ip", machine.IPAddress). Str("ip", machine.IPAddresses).
Msgf("Failed to parse IP Prefix from IP: %s", machine.IPAddress) Msgf("Failed to parse machine IP: %s", machine.IPAddresses)
return nil, err return nil, err
} }
addrs = append(addrs, ip) // missing the ipv6 ? ip := netaddr.IPPrefixFrom(nodeAddr, nodeAddr.BitLen())
addrs = append(addrs, ip)
allowedIPs := []netaddr.IPPrefix{} allowedIPs := []netaddr.IPPrefix{}
allowedIPs = append( allowedIPs = append(