|
@@ -10,66 +10,93 @@ import (
|
|
|
"github.com/sagernet/sing-box/common/conntrack"
|
|
|
C "github.com/sagernet/sing-box/constant"
|
|
|
"github.com/sagernet/sing-box/option"
|
|
|
+ "github.com/sagernet/sing/common/atomic"
|
|
|
"github.com/sagernet/sing/common/control"
|
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
|
N "github.com/sagernet/sing/common/network"
|
|
|
)
|
|
|
|
|
|
-var _ WireGuardListener = (*DefaultDialer)(nil)
|
|
|
+var (
|
|
|
+ _ ParallelInterfaceDialer = (*DefaultDialer)(nil)
|
|
|
+ _ WireGuardListener = (*DefaultDialer)(nil)
|
|
|
+)
|
|
|
|
|
|
type DefaultDialer struct {
|
|
|
- dialer4 tcpDialer
|
|
|
- dialer6 tcpDialer
|
|
|
- udpDialer4 net.Dialer
|
|
|
- udpDialer6 net.Dialer
|
|
|
- udpListener net.ListenConfig
|
|
|
- udpAddr4 string
|
|
|
- udpAddr6 string
|
|
|
- isWireGuardListener bool
|
|
|
+ dialer4 tcpDialer
|
|
|
+ dialer6 tcpDialer
|
|
|
+ udpDialer4 net.Dialer
|
|
|
+ udpDialer6 net.Dialer
|
|
|
+ udpListener net.ListenConfig
|
|
|
+ udpAddr4 string
|
|
|
+ udpAddr6 string
|
|
|
+ isWireGuardListener bool
|
|
|
+ networkManager adapter.NetworkManager
|
|
|
+ networkStrategy C.NetworkStrategy
|
|
|
+ networkFallbackDelay time.Duration
|
|
|
+ networkLastFallback atomic.TypedValue[time.Time]
|
|
|
}
|
|
|
|
|
|
func NewDefault(networkManager adapter.NetworkManager, options option.DialerOptions) (*DefaultDialer, error) {
|
|
|
- var dialer net.Dialer
|
|
|
- var listener net.ListenConfig
|
|
|
+ var (
|
|
|
+ dialer net.Dialer
|
|
|
+ listener net.ListenConfig
|
|
|
+ interfaceFinder control.InterfaceFinder
|
|
|
+ networkStrategy C.NetworkStrategy
|
|
|
+ networkFallbackDelay time.Duration
|
|
|
+ )
|
|
|
+ if networkManager != nil {
|
|
|
+ interfaceFinder = networkManager.InterfaceFinder()
|
|
|
+ } else {
|
|
|
+ interfaceFinder = control.NewDefaultInterfaceFinder()
|
|
|
+ }
|
|
|
if options.BindInterface != "" {
|
|
|
- var interfaceFinder control.InterfaceFinder
|
|
|
- if networkManager != nil {
|
|
|
- interfaceFinder = networkManager.InterfaceFinder()
|
|
|
- } else {
|
|
|
- interfaceFinder = control.NewDefaultInterfaceFinder()
|
|
|
- }
|
|
|
bindFunc := control.BindToInterface(interfaceFinder, options.BindInterface, -1)
|
|
|
dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
- } else if networkManager != nil && networkManager.AutoDetectInterface() {
|
|
|
- bindFunc := networkManager.AutoDetectInterfaceFunc()
|
|
|
- dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
- listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
- } else if networkManager != nil && networkManager.DefaultInterface() != "" {
|
|
|
- bindFunc := control.BindToInterface(networkManager.InterfaceFinder(), networkManager.DefaultInterface(), -1)
|
|
|
- dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
- listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
- }
|
|
|
- var autoRedirectOutputMark uint32
|
|
|
- if networkManager != nil {
|
|
|
- autoRedirectOutputMark = networkManager.AutoRedirectOutputMark()
|
|
|
- }
|
|
|
- if autoRedirectOutputMark > 0 {
|
|
|
- dialer.Control = control.Append(dialer.Control, control.RoutingMark(autoRedirectOutputMark))
|
|
|
- listener.Control = control.Append(listener.Control, control.RoutingMark(autoRedirectOutputMark))
|
|
|
}
|
|
|
if options.RoutingMark > 0 {
|
|
|
dialer.Control = control.Append(dialer.Control, control.RoutingMark(options.RoutingMark))
|
|
|
listener.Control = control.Append(listener.Control, control.RoutingMark(options.RoutingMark))
|
|
|
+ }
|
|
|
+ if networkManager != nil {
|
|
|
+ autoRedirectOutputMark := networkManager.AutoRedirectOutputMark()
|
|
|
if autoRedirectOutputMark > 0 {
|
|
|
- return nil, E.New("`auto_redirect` with `route_[_exclude]_address_set is conflict with `routing_mark`")
|
|
|
+ if options.RoutingMark > 0 {
|
|
|
+ return nil, E.New("`routing_mark` is conflict with `tun.auto_redirect` with `tun.route_[_exclude]_address_set")
|
|
|
+ }
|
|
|
+ dialer.Control = control.Append(dialer.Control, control.RoutingMark(autoRedirectOutputMark))
|
|
|
+ listener.Control = control.Append(listener.Control, control.RoutingMark(autoRedirectOutputMark))
|
|
|
}
|
|
|
- } else if networkManager != nil && networkManager.DefaultMark() > 0 {
|
|
|
- dialer.Control = control.Append(dialer.Control, control.RoutingMark(networkManager.DefaultMark()))
|
|
|
- listener.Control = control.Append(listener.Control, control.RoutingMark(networkManager.DefaultMark()))
|
|
|
- if autoRedirectOutputMark > 0 {
|
|
|
- return nil, E.New("`auto_redirect` with `route_[_exclude]_address_set is conflict with `default_mark`")
|
|
|
+ }
|
|
|
+ if C.NetworkStrategy(options.NetworkStrategy) != C.NetworkStrategyDefault {
|
|
|
+ if options.BindInterface != "" || options.Inet4BindAddress != nil || options.Inet6BindAddress != nil {
|
|
|
+ return nil, E.New("`network_strategy` is conflict with `bind_interface`, `inet4_bind_address` and `inet6_bind_address`")
|
|
|
+ }
|
|
|
+ networkStrategy = C.NetworkStrategy(options.NetworkStrategy)
|
|
|
+ networkFallbackDelay = time.Duration(options.NetworkFallbackDelay)
|
|
|
+ if networkManager == nil || !networkManager.AutoDetectInterface() {
|
|
|
+ return nil, E.New("`route.auto_detect_interface` is require by `network_strategy`")
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if networkManager != nil && options.BindInterface == "" && options.Inet4BindAddress == nil && options.Inet6BindAddress == nil {
|
|
|
+ defaultOptions := networkManager.DefaultOptions()
|
|
|
+ if defaultOptions.DefaultInterface != "" {
|
|
|
+ bindFunc := control.BindToInterface(networkManager.InterfaceFinder(), defaultOptions.DefaultInterface, -1)
|
|
|
+ dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
+ listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
+ } else if networkManager.AutoDetectInterface() {
|
|
|
+ if defaultOptions.DefaultNetworkStrategy != C.NetworkStrategyDefault && C.NetworkStrategy(options.NetworkStrategy) == C.NetworkStrategyDefault {
|
|
|
+ networkStrategy = defaultOptions.DefaultNetworkStrategy
|
|
|
+ networkFallbackDelay = defaultOptions.DefaultFallbackDelay
|
|
|
+ bindFunc := networkManager.ProtectFunc()
|
|
|
+ dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
+ listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
+ } else {
|
|
|
+ bindFunc := networkManager.AutoDetectInterfaceFunc()
|
|
|
+ dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
|
+ listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if options.ReuseAddr {
|
|
@@ -130,6 +157,9 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
|
listener.Control = control.Append(listener.Control, controlFn)
|
|
|
}
|
|
|
}
|
|
|
+ if networkStrategy != C.NetworkStrategyDefault && options.TCPFastOpen {
|
|
|
+ return nil, E.New("`tcp_fast_open` is conflict with `network_strategy` or `route.default_network_strategy`")
|
|
|
+ }
|
|
|
tcpDialer4, err := newTCPDialer(dialer4, options.TCPFastOpen)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
@@ -139,14 +169,17 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
|
return nil, err
|
|
|
}
|
|
|
return &DefaultDialer{
|
|
|
- tcpDialer4,
|
|
|
- tcpDialer6,
|
|
|
- udpDialer4,
|
|
|
- udpDialer6,
|
|
|
- listener,
|
|
|
- udpAddr4,
|
|
|
- udpAddr6,
|
|
|
- options.IsWireGuardListener,
|
|
|
+ dialer4: tcpDialer4,
|
|
|
+ dialer6: tcpDialer6,
|
|
|
+ udpDialer4: udpDialer4,
|
|
|
+ udpDialer6: udpDialer6,
|
|
|
+ udpListener: listener,
|
|
|
+ udpAddr4: udpAddr4,
|
|
|
+ udpAddr6: udpAddr6,
|
|
|
+ isWireGuardListener: options.IsWireGuardListener,
|
|
|
+ networkManager: networkManager,
|
|
|
+ networkStrategy: networkStrategy,
|
|
|
+ networkFallbackDelay: networkFallbackDelay,
|
|
|
}, nil
|
|
|
}
|
|
|
|
|
@@ -154,33 +187,88 @@ func (d *DefaultDialer) DialContext(ctx context.Context, network string, address
|
|
|
if !address.IsValid() {
|
|
|
return nil, E.New("invalid address")
|
|
|
}
|
|
|
- switch N.NetworkName(network) {
|
|
|
- case N.NetworkUDP:
|
|
|
+ if d.networkStrategy == C.NetworkStrategyDefault {
|
|
|
+ switch N.NetworkName(network) {
|
|
|
+ case N.NetworkUDP:
|
|
|
+ if !address.IsIPv6() {
|
|
|
+ return trackConn(d.udpDialer4.DialContext(ctx, network, address.String()))
|
|
|
+ } else {
|
|
|
+ return trackConn(d.udpDialer6.DialContext(ctx, network, address.String()))
|
|
|
+ }
|
|
|
+ }
|
|
|
if !address.IsIPv6() {
|
|
|
- return trackConn(d.udpDialer4.DialContext(ctx, network, address.String()))
|
|
|
+ return trackConn(DialSlowContext(&d.dialer4, ctx, network, address))
|
|
|
} else {
|
|
|
- return trackConn(d.udpDialer6.DialContext(ctx, network, address.String()))
|
|
|
+ return trackConn(DialSlowContext(&d.dialer6, ctx, network, address))
|
|
|
}
|
|
|
+ } else {
|
|
|
+ return d.DialParallelInterface(ctx, network, address, d.networkStrategy, d.networkFallbackDelay)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network string, address M.Socksaddr, strategy C.NetworkStrategy, fallbackDelay time.Duration) (net.Conn, error) {
|
|
|
+ if strategy == C.NetworkStrategyDefault {
|
|
|
+ return d.DialContext(ctx, network, address)
|
|
|
}
|
|
|
- if !address.IsIPv6() {
|
|
|
- return trackConn(DialSlowContext(&d.dialer4, ctx, network, address))
|
|
|
+ if !d.networkManager.AutoDetectInterface() {
|
|
|
+ return nil, E.New("`route.auto_detect_interface` is require by `network_strategy`")
|
|
|
+ }
|
|
|
+ var dialer net.Dialer
|
|
|
+ if N.NetworkName(network) == N.NetworkTCP {
|
|
|
+ dialer = dialerFromTCPDialer(d.dialer4)
|
|
|
+ } else {
|
|
|
+ dialer = d.udpDialer4
|
|
|
+ }
|
|
|
+ fastFallback := time.Now().Sub(d.networkLastFallback.Load()) < C.TCPTimeout
|
|
|
+ var (
|
|
|
+ conn net.Conn
|
|
|
+ isPrimary bool
|
|
|
+ err error
|
|
|
+ )
|
|
|
+ if !fastFallback {
|
|
|
+ conn, isPrimary, err = d.dialParallelInterface(ctx, dialer, network, address.String(), strategy, fallbackDelay)
|
|
|
} else {
|
|
|
- return trackConn(DialSlowContext(&d.dialer6, ctx, network, address))
|
|
|
+ conn, isPrimary, err = d.dialParallelInterfaceFastFallback(ctx, dialer, network, address.String(), strategy, fallbackDelay, d.networkLastFallback.Store)
|
|
|
}
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ if !fastFallback && !isPrimary {
|
|
|
+ d.networkLastFallback.Store(time.Now())
|
|
|
+ }
|
|
|
+ return trackConn(conn, nil)
|
|
|
}
|
|
|
|
|
|
func (d *DefaultDialer) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
|
|
|
- if destination.IsIPv6() {
|
|
|
- return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr6))
|
|
|
- } else if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
|
|
|
- return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP+"4", d.udpAddr4))
|
|
|
+ if d.networkStrategy == C.NetworkStrategyDefault {
|
|
|
+ if destination.IsIPv6() {
|
|
|
+ return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr6))
|
|
|
+ } else if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
|
|
|
+ return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP+"4", d.udpAddr4))
|
|
|
+ } else {
|
|
|
+ return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4))
|
|
|
+ }
|
|
|
} else {
|
|
|
- return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4))
|
|
|
+ return d.ListenSerialInterfacePacket(ctx, destination, d.networkStrategy, d.networkFallbackDelay)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (d *DefaultDialer) ListenSerialInterfacePacket(ctx context.Context, destination M.Socksaddr, strategy C.NetworkStrategy, fallbackDelay time.Duration) (net.PacketConn, error) {
|
|
|
+ if strategy == C.NetworkStrategyDefault {
|
|
|
+ return d.ListenPacket(ctx, destination)
|
|
|
+ }
|
|
|
+ if !d.networkManager.AutoDetectInterface() {
|
|
|
+ return nil, E.New("`route.auto_detect_interface` is require by `network_strategy`")
|
|
|
+ }
|
|
|
+ network := N.NetworkUDP
|
|
|
+ if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
|
|
|
+ network += "4"
|
|
|
}
|
|
|
+ return trackPacketConn(d.listenSerialInterfacePacket(ctx, d.udpListener, network, "", strategy, fallbackDelay))
|
|
|
}
|
|
|
|
|
|
func (d *DefaultDialer) ListenPacketCompat(network, address string) (net.PacketConn, error) {
|
|
|
- return d.udpListener.ListenPacket(context.Background(), network, address)
|
|
|
+ return d.listenSerialInterfacePacket(context.Background(), d.udpListener, network, address, d.networkStrategy, d.networkFallbackDelay)
|
|
|
}
|
|
|
|
|
|
func trackConn(conn net.Conn, err error) (net.Conn, error) {
|