lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-26 01:15:38 +00:00
Code Issues Releases Wiki Activity

fix strategy least load

Browse Source
This commit is contained in:
Shelikhoo 2021-06-19 13:00:32 +01:00
parent 8adb3dc5a6
commit b61d55c6a7
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/router/strategy_leastload.go
View File

@ -61,10 +61,6 @@ type node struct {
func (l *LeastLoadStrategy) InjectContext(ctx context.Context) {
l.ctx = ctx
common.Must(core.RequireFeatures(ctx, func(observerInstance *observatory.Observer) {
l.observer = observerInstance
}))
}
func (s *LeastLoadStrategy) PickOutbound(candidates []string) string {
@ -140,6 +136,13 @@ func (s *LeastLoadStrategy) selectLeastLoad(nodes []*node) []*node {
}
func (s *LeastLoadStrategy) getNodes(candidates []string, maxRTT time.Duration) []*node {
if s.observer == nil {
common.Must(core.RequireFeatures(s.ctx, func(observatory extension.Observatory) error {
s.observer = observatory
return nil
}))
}
var result proto.Message
if s.settings.ObserverTag == "" {
observeResult, err := s.observer.GetObservation(s.ctx)
@ -164,7 +167,7 @@ func (s *LeastLoadStrategy) getNodes(candidates []string, maxRTT time.Duration)
var ret []*node
for _, v := range results.Status {
if v.Alive && v.Delay < maxRTT.Milliseconds() && outboundlist.contains(v.OutboundTag) {
if v.Alive && (v.Delay < maxRTT.Milliseconds() || maxRTT == 0) && outboundlist.contains(v.OutboundTag) {
record := &node{
Tag: v.OutboundTag,
CountAll: 1,