@ -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 } )
}
}
}
}