yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-07-18 21:44:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix failover

Browse Source
This commit is contained in:
Shtorm
2026-03-02 19:33:59 +03:00
parent efa88fac6d
commit be457896dd
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
protocol/group/failover.go
View File

@@ -3,6 +3,7 @@ package group
import ( import (
"context" "context"
"net" "net"
"sync"
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/adapter/outbound" "github.com/sagernet/sing-box/adapter/outbound"
@@ -26,11 +27,14 @@ var (
type Failover struct { type Failover struct {
outbound.Adapter outbound.Adapter
ctx context.Context ctx context.Context
outbound adapter.OutboundManager outbound adapter.OutboundManager
logger logger.ContextLogger logger logger.ContextLogger
tags []string tags []string
outbounds map[string]adapter.Outbound outbounds map[string]adapter.Outbound
lastUsedOutbound string
mtx sync.Mutex
} }
func NewFailover(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.FailoverOutboundOptions) (adapter.Outbound, error) { func NewFailover(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.FailoverOutboundOptions) (adapter.Outbound, error) {
@@ -38,12 +42,13 @@ func NewFailover(ctx context.Context, router adapter.Router, logger log.ContextL
return nil, E.New("missing tags") return nil, E.New("missing tags")
} }
outbound := &Failover{ outbound := &Failover{
Adapter: outbound.NewAdapter(C.TypeFailover, tag, []string{N.NetworkTCP, N.NetworkUDP}, options.Outbounds), Adapter: outbound.NewAdapter(C.TypeFailover, tag, []string{N.NetworkTCP, N.NetworkUDP}, options.Outbounds),
ctx: ctx, ctx: ctx,
outbound: service.FromContext[adapter.OutboundManager](ctx), outbound: service.FromContext[adapter.OutboundManager](ctx),
logger: logger, logger: logger,
tags: options.Outbounds, tags: options.Outbounds,
outbounds: make(map[string]adapter.Outbound, len(options.Outbounds)), outbounds: make(map[string]adapter.Outbound, len(options.Outbounds)),
lastUsedOutbound: options.Outbounds[0],
} }
return outbound, nil return outbound, nil
} }
@@ -60,7 +65,9 @@ func (s *Failover) Start() error {
} }
func (s *Failover) Now() string { func (s *Failover) Now() string {
return s.tags[0] s.mtx.Lock()
defer s.mtx.Unlock()
return s.lastUsedOutbound
} }
func (s *Failover) All() []string { func (s *Failover) All() []string {
@@ -76,6 +83,9 @@ func (s *Failover) DialContext(ctx context.Context, network string, destination
s.logger.ErrorContext(ctx, err) s.logger.ErrorContext(ctx, err)
continue continue
} }
s.mtx.Lock()
defer s.mtx.Unlock()
s.lastUsedOutbound = outbound.Tag()
return conn, nil return conn, nil
} }
return nil, err return nil, err