black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix urltest logic

Browse source
This commit is contained in:
世界 2024-05-10 17:40:54 +08:00
parent 1f470c69c4
commit 44277e5dd2
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
outbound/urltest.go
View file

@ -287,8 +287,23 @@ func (g *URLTestGroup) Close() error {
func (g *URLTestGroup) Select(network string) (adapter.Outbound, bool) { func (g *URLTestGroup) Select(network string) (adapter.Outbound, bool) {
var minDelay uint16 var minDelay uint16
var minTime time.Time
var minOutbound adapter.Outbound var minOutbound adapter.Outbound
switch network {
case N.NetworkTCP:
if g.selectedOutboundTCP != nil {
if history := g.history.LoadURLTestHistory(RealTag(g.selectedOutboundTCP)); history != nil {
minOutbound = g.selectedOutboundTCP
minDelay = history.Delay
}
}
case N.NetworkUDP:
if g.selectedOutboundUDP != nil {
if history := g.history.LoadURLTestHistory(RealTag(g.selectedOutboundUDP)); history != nil {
minOutbound = g.selectedOutboundUDP
minDelay = history.Delay
}
}
}
for _, detour := range g.outbounds { for _, detour := range g.outbounds {
if !common.Contains(detour.Network(), network) { if !common.Contains(detour.Network(), network) {
continue continue
@ -297,9 +312,8 @@ func (g *URLTestGroup) Select(network string) (adapter.Outbound, bool) {
if history == nil { if history == nil {
continue continue
} }
if minDelay == 0 || minDelay > history.Delay+g.tolerance || minDelay > history.Delay-g.tolerance && minTime.Before(history.Time) { if minDelay == 0 || minDelay > history.Delay+g.tolerance {
minDelay = history.Delay minDelay = history.Delay
minTime = history.Time
minOutbound = detour minOutbound = detour
} }
} }