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

net/netcheck: do not add derps if IPv4/IPv6 is set to "none"

Browse Source 
It was documented as such but seems to have been dropped in a
refactor, restore the behavior. This brings down the time it
takes to run a single integration test by 2s which adds up
quite a bit.

Updates tailscale/corp#19786

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2024-05-07 15:50:54 -07:00 committed by Maisem Ali
parent d7bdd8e2a7
commit 85b9a6c601
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/netcheck/netcheck.go
View File

@ -450,10 +450,10 @@ func makeProbePlan(dm *tailcfg.DERPMap, ifState *netmon.State, last *Report) (pl
if try > 1 { if try > 1 {
delay += time.Duration(try) * 50 * time.Millisecond delay += time.Duration(try) * 50 * time.Millisecond
} }
if do4 || n.IsTestNode() { if n.IPv4 != "none" && (do4 || n.IsTestNode()) {
p4 = append(p4, probe{delay: delay, node: n.Name, proto: probeIPv4}) p4 = append(p4, probe{delay: delay, node: n.Name, proto: probeIPv4})
} }
if do6 || n.IsTestNode() { if n.IPv6 != "none" && (do6 || n.IsTestNode()) {
p6 = append(p6, probe{delay: delay, node: n.Name, proto: probeIPv6}) p6 = append(p6, probe{delay: delay, node: n.Name, proto: probeIPv6})
} }
} }
@ -476,10 +476,10 @@ func makeProbePlanInitial(dm *tailcfg.DERPMap, ifState *netmon.State) (plan prob
for try := 0; try < 3; try++ { for try := 0; try < 3; try++ {
n := reg.Nodes[try%len(reg.Nodes)] n := reg.Nodes[try%len(reg.Nodes)]
delay := time.Duration(try) * defaultInitialRetransmitTime delay := time.Duration(try) * defaultInitialRetransmitTime
if ifState.HaveV4 && nodeMight4(n) || n.IsTestNode() { if n.IPv4 != "none" && ((ifState.HaveV4 && nodeMight4(n)) || n.IsTestNode()) {
p4 = append(p4, probe{delay: delay, node: n.Name, proto: probeIPv4}) p4 = append(p4, probe{delay: delay, node: n.Name, proto: probeIPv4})
} }
if ifState.HaveV6 && nodeMight6(n) || n.IsTestNode() { if n.IPv6 != "none" && ((ifState.HaveV6 && nodeMight6(n)) || n.IsTestNode()) {
p6 = append(p6, probe{delay: delay, node: n.Name, proto: probeIPv6}) p6 = append(p6, probe{delay: delay, node: n.Name, proto: probeIPv6})
} }
} }