The guard refused to start an AmneziaWG endpoint whose detour chain reached a WireGuard one, and refused silently: not an error, just started=false, after which every dial failed with "WireGuard is not ready yet". A selector hook went further and suspended an already-working node the moment its group switched to a WireGuard member. It existed because AmneziaWG inside WireGuard hung the kernel on Android. We do not ship Android, upstream dropped the guard once the cause was gone, and the cure landed here yesterday — the ClientBind reserved-gate plus the submodule pin that carries its twin. So the tree held both the cure and the prohibition on using it, and the configuration simply did not come up while looking like a node that "just does not work". Also takes the two fixes that belong with it. ClientBind.conn was read on a lock-free fast path and written under a mutex; upstream found that race with the same end-to-end test we wrote yesterday, so we had taken one half of a pair again. And the outer WireGuard UDP socket forced DF, unlike direct, hysteria and tuic — with encapsulation the datagram regularly exceeds the path MTU and the kernel drops it instead of fragmenting, a symptom indistinguishable from the bug we spent yesterday on. The race needed its own test: the existing e2e run did not flag it under -race even at -count=15. Eight goroutines over both connect branches reproduce it deterministically, naming the lock-free read and the guarded write. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
191 lines
5.8 KiB
Go
191 lines
5.8 KiB
Go
package group
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
|
|
"github.com/sagernet/sing-box/adapter"
|
|
"github.com/sagernet/sing-box/adapter/outbound"
|
|
"github.com/sagernet/sing-box/common/interrupt"
|
|
"github.com/sagernet/sing-box/common/urltest"
|
|
C "github.com/sagernet/sing-box/constant"
|
|
"github.com/sagernet/sing-box/log"
|
|
"github.com/sagernet/sing-box/option"
|
|
"github.com/sagernet/sing/common"
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
"github.com/sagernet/sing/common/logger"
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
N "github.com/sagernet/sing/common/network"
|
|
"github.com/sagernet/sing/service"
|
|
)
|
|
|
|
func RegisterSelector(registry *outbound.Registry) {
|
|
outbound.Register[option.SelectorOutboundOptions](registry, C.TypeSelector, NewSelector)
|
|
}
|
|
|
|
var (
|
|
_ adapter.OutboundGroup = (*Selector)(nil)
|
|
_ adapter.ConnectionHandler = (*Selector)(nil)
|
|
_ adapter.PacketConnectionHandler = (*Selector)(nil)
|
|
)
|
|
|
|
type Selector struct {
|
|
outbound.Adapter
|
|
ctx context.Context
|
|
outbound adapter.OutboundManager
|
|
connection adapter.ConnectionManager
|
|
logger logger.ContextLogger
|
|
tags []string
|
|
defaultTag string
|
|
outbounds map[string]adapter.Outbound
|
|
selected common.TypedValue[adapter.Outbound]
|
|
history *urltest.HistoryStorage
|
|
interruptGroup *interrupt.Group
|
|
interruptExternalConnections bool
|
|
}
|
|
|
|
func NewSelector(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.SelectorOutboundOptions) (adapter.Outbound, error) {
|
|
outbound := &Selector{
|
|
Adapter: outbound.NewAdapter(C.TypeSelector, tag, nil, options.Outbounds),
|
|
ctx: ctx,
|
|
outbound: service.FromContext[adapter.OutboundManager](ctx),
|
|
connection: service.FromContext[adapter.ConnectionManager](ctx),
|
|
logger: logger,
|
|
tags: options.Outbounds,
|
|
defaultTag: options.Default,
|
|
outbounds: make(map[string]adapter.Outbound),
|
|
history: service.PtrFromContext[urltest.HistoryStorage](ctx),
|
|
interruptGroup: interrupt.NewGroup(),
|
|
interruptExternalConnections: options.InterruptExistConnections,
|
|
}
|
|
if len(outbound.tags) == 0 {
|
|
return nil, E.New("missing tags")
|
|
}
|
|
return outbound, nil
|
|
}
|
|
|
|
func (s *Selector) Network() []string {
|
|
selected := s.selected.Load()
|
|
if selected == nil {
|
|
return []string{N.NetworkTCP, N.NetworkUDP}
|
|
}
|
|
return selected.Network()
|
|
}
|
|
|
|
func (s *Selector) Start() error {
|
|
for i, tag := range s.tags {
|
|
detour, loaded := s.outbound.Outbound(tag)
|
|
if !loaded {
|
|
return E.New("outbound ", i, " not found: ", tag)
|
|
}
|
|
s.outbounds[tag] = detour
|
|
}
|
|
|
|
if s.Tag() != "" {
|
|
cacheFile := service.FromContext[adapter.CacheFile](s.ctx)
|
|
if cacheFile != nil {
|
|
selected := cacheFile.LoadSelected(s.Tag())
|
|
if selected != "" {
|
|
detour, loaded := s.outbounds[selected]
|
|
if loaded {
|
|
s.selected.Store(detour)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if s.defaultTag != "" {
|
|
detour, loaded := s.outbounds[s.defaultTag]
|
|
if !loaded {
|
|
return E.New("default outbound not found: ", s.defaultTag)
|
|
}
|
|
s.selected.Store(detour)
|
|
return nil
|
|
}
|
|
|
|
s.selected.Store(s.outbounds[s.tags[0]])
|
|
return nil
|
|
}
|
|
|
|
func (s *Selector) Now() string {
|
|
selected := s.selected.Load()
|
|
if selected == nil {
|
|
return s.tags[0]
|
|
}
|
|
return selected.Tag()
|
|
}
|
|
|
|
func (s *Selector) All() []string {
|
|
return s.tags
|
|
}
|
|
|
|
func (s *Selector) SelectOutbound(tag string) bool {
|
|
detour, loaded := s.outbounds[tag]
|
|
if !loaded {
|
|
return false
|
|
}
|
|
if s.selected.Load() == detour {
|
|
return true
|
|
}
|
|
s.selected.Store(detour)
|
|
invalidateReachability(s.ctx) // lx: SPEC 020 — active selection changed
|
|
if s.Tag() != "" {
|
|
cacheFile := service.FromContext[adapter.CacheFile](s.ctx)
|
|
if cacheFile != nil {
|
|
err := cacheFile.StoreSelected(s.Tag(), tag)
|
|
if err != nil {
|
|
s.logger.Error("store selected: ", err)
|
|
}
|
|
}
|
|
}
|
|
s.interruptGroup.Interrupt(s.interruptExternalConnections)
|
|
if s.history != nil {
|
|
s.history.NotifyUpdated()
|
|
}
|
|
return true
|
|
}
|
|
|
|
func (s *Selector) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
|
|
conn, err := s.selected.Load().DialContext(ctx, network, destination)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return s.interruptGroup.NewConn(conn, interrupt.IsExternalConnectionFromContext(ctx)), nil
|
|
}
|
|
|
|
func (s *Selector) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
|
|
conn, err := s.selected.Load().ListenPacket(ctx, destination)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return s.interruptGroup.NewPacketConn(conn, interrupt.IsExternalConnectionFromContext(ctx)), nil
|
|
}
|
|
|
|
func (s *Selector) NewConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) {
|
|
ctx = interrupt.ContextWithIsExternalConnection(ctx)
|
|
selected := s.selected.Load()
|
|
if outboundHandler, isHandler := selected.(adapter.ConnectionHandler); isHandler {
|
|
outboundHandler.NewConnection(ctx, conn, metadata, onClose)
|
|
} else {
|
|
s.connection.NewConnection(ctx, selected, conn, metadata, onClose)
|
|
}
|
|
}
|
|
|
|
func (s *Selector) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) {
|
|
ctx = interrupt.ContextWithIsExternalConnection(ctx)
|
|
selected := s.selected.Load()
|
|
if outboundHandler, isHandler := selected.(adapter.PacketConnectionHandler); isHandler {
|
|
outboundHandler.NewPacketConnection(ctx, conn, metadata, onClose)
|
|
} else {
|
|
s.connection.NewPacketConnection(ctx, selected, conn, metadata, onClose)
|
|
}
|
|
}
|
|
|
|
func RealTag(detour adapter.Outbound) string {
|
|
if group, isGroup := detour.(adapter.OutboundGroup); isGroup {
|
|
return group.Now()
|
|
}
|
|
return detour.Tag()
|
|
}
|