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

net/interfaces: explicitly check netaddr.IP.Is6 in isUsableV6

Browse Source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2021-07-28 14:30:06 -04:00 committed by Denton Gentry
parent 3ff8a55fa7
commit effee49e45
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/interfaces/interfaces.go
View File

@ -548,7 +548,7 @@ func isUsableV4(ip netaddr.IP) bool {
// (fc00::/7) are in some environments used with address translation. // (fc00::/7) are in some environments used with address translation.
func isUsableV6(ip netaddr.IP) bool { func isUsableV6(ip netaddr.IP) bool {
return v6Global1.Contains(ip) || return v6Global1.Contains(ip) ||
(ip.IsPrivate() && !tsaddr.TailscaleULARange().Contains(ip)) (ip.Is6() && ip.IsPrivate() && !tsaddr.TailscaleULARange().Contains(ip))
} }
var ( var (

2
net/interfaces/interfaces_test.go
View File

@ -58,6 +58,8 @@ func TestIsUsableV6(t *testing.T) {
{"zeros", "0000:0000:0000:0000:0000:0000:0000:0000", false}, {"zeros", "0000:0000:0000:0000:0000:0000:0000:0000", false},
{"Link Local", "fe80::1", false}, {"Link Local", "fe80::1", false},
{"Global", "2602::1", true}, {"Global", "2602::1", true},
{"IPv4 public", "192.0.2.1", false},
{"IPv4 private", "192.168.1.1", false},
} }
for _, test := range tests { for _, test := range tests {