|
@@ -10,6 +10,7 @@ import (
|
|
"github.com/sagernet/sing-box/common/conntrack"
|
|
"github.com/sagernet/sing-box/common/conntrack"
|
|
C "github.com/sagernet/sing-box/constant"
|
|
C "github.com/sagernet/sing-box/constant"
|
|
"github.com/sagernet/sing-box/option"
|
|
"github.com/sagernet/sing-box/option"
|
|
|
|
+ "github.com/sagernet/sing/common"
|
|
"github.com/sagernet/sing/common/atomic"
|
|
"github.com/sagernet/sing/common/atomic"
|
|
"github.com/sagernet/sing/common/control"
|
|
"github.com/sagernet/sing/common/control"
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
E "github.com/sagernet/sing/common/exceptions"
|
|
@@ -33,6 +34,8 @@ type DefaultDialer struct {
|
|
isWireGuardListener bool
|
|
isWireGuardListener bool
|
|
networkManager adapter.NetworkManager
|
|
networkManager adapter.NetworkManager
|
|
networkStrategy C.NetworkStrategy
|
|
networkStrategy C.NetworkStrategy
|
|
|
|
+ networkType []C.InterfaceType
|
|
|
|
+ fallbackNetworkType []C.InterfaceType
|
|
networkFallbackDelay time.Duration
|
|
networkFallbackDelay time.Duration
|
|
networkLastFallback atomic.TypedValue[time.Time]
|
|
networkLastFallback atomic.TypedValue[time.Time]
|
|
}
|
|
}
|
|
@@ -43,6 +46,8 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
listener net.ListenConfig
|
|
listener net.ListenConfig
|
|
interfaceFinder control.InterfaceFinder
|
|
interfaceFinder control.InterfaceFinder
|
|
networkStrategy C.NetworkStrategy
|
|
networkStrategy C.NetworkStrategy
|
|
|
|
+ networkType []C.InterfaceType
|
|
|
|
+ fallbackNetworkType []C.InterfaceType
|
|
networkFallbackDelay time.Duration
|
|
networkFallbackDelay time.Duration
|
|
)
|
|
)
|
|
if networkManager != nil {
|
|
if networkManager != nil {
|
|
@@ -56,8 +61,8 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
listener.Control = control.Append(listener.Control, bindFunc)
|
|
listener.Control = control.Append(listener.Control, bindFunc)
|
|
}
|
|
}
|
|
if options.RoutingMark > 0 {
|
|
if options.RoutingMark > 0 {
|
|
- dialer.Control = control.Append(dialer.Control, control.RoutingMark(options.RoutingMark))
|
|
|
|
- listener.Control = control.Append(listener.Control, control.RoutingMark(options.RoutingMark))
|
|
|
|
|
|
+ dialer.Control = control.Append(dialer.Control, control.RoutingMark(uint32(options.RoutingMark)))
|
|
|
|
+ listener.Control = control.Append(listener.Control, control.RoutingMark(uint32(options.RoutingMark)))
|
|
}
|
|
}
|
|
if networkManager != nil {
|
|
if networkManager != nil {
|
|
autoRedirectOutputMark := networkManager.AutoRedirectOutputMark()
|
|
autoRedirectOutputMark := networkManager.AutoRedirectOutputMark()
|
|
@@ -74,6 +79,8 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
return nil, E.New("`network_strategy` is conflict with `bind_interface`, `inet4_bind_address` and `inet6_bind_address`")
|
|
return nil, E.New("`network_strategy` is conflict with `bind_interface`, `inet4_bind_address` and `inet6_bind_address`")
|
|
}
|
|
}
|
|
networkStrategy = C.NetworkStrategy(options.NetworkStrategy)
|
|
networkStrategy = C.NetworkStrategy(options.NetworkStrategy)
|
|
|
|
+ networkType = common.Map(options.NetworkType, option.InterfaceType.Build)
|
|
|
|
+ fallbackNetworkType = common.Map(options.FallbackNetworkType, option.InterfaceType.Build)
|
|
networkFallbackDelay = time.Duration(options.NetworkFallbackDelay)
|
|
networkFallbackDelay = time.Duration(options.NetworkFallbackDelay)
|
|
if networkManager == nil || !networkManager.AutoDetectInterface() {
|
|
if networkManager == nil || !networkManager.AutoDetectInterface() {
|
|
return nil, E.New("`route.auto_detect_interface` is require by `network_strategy`")
|
|
return nil, E.New("`route.auto_detect_interface` is require by `network_strategy`")
|
|
@@ -81,23 +88,31 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
}
|
|
}
|
|
if networkManager != nil && options.BindInterface == "" && options.Inet4BindAddress == nil && options.Inet6BindAddress == nil {
|
|
if networkManager != nil && options.BindInterface == "" && options.Inet4BindAddress == nil && options.Inet6BindAddress == nil {
|
|
defaultOptions := networkManager.DefaultOptions()
|
|
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()
|
|
|
|
|
|
+ if options.BindInterface == "" {
|
|
|
|
+ if defaultOptions.BindInterface != "" {
|
|
|
|
+ bindFunc := control.BindToInterface(networkManager.InterfaceFinder(), defaultOptions.BindInterface, -1)
|
|
dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
dialer.Control = control.Append(dialer.Control, bindFunc)
|
|
listener.Control = control.Append(listener.Control, bindFunc)
|
|
listener.Control = control.Append(listener.Control, bindFunc)
|
|
|
|
+ } else if networkManager.AutoDetectInterface() {
|
|
|
|
+ if defaultOptions.NetworkStrategy != C.NetworkStrategyDefault && C.NetworkStrategy(options.NetworkStrategy) == C.NetworkStrategyDefault {
|
|
|
|
+ networkStrategy = defaultOptions.NetworkStrategy
|
|
|
|
+ networkType = defaultOptions.NetworkType
|
|
|
|
+ fallbackNetworkType = defaultOptions.FallbackNetworkType
|
|
|
|
+ networkFallbackDelay = defaultOptions.FallbackDelay
|
|
|
|
+ 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.RoutingMark == 0 && defaultOptions.RoutingMark != 0 {
|
|
|
|
+ dialer.Control = control.Append(dialer.Control, control.RoutingMark(defaultOptions.RoutingMark))
|
|
|
|
+ listener.Control = control.Append(listener.Control, control.RoutingMark(defaultOptions.RoutingMark))
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if options.ReuseAddr {
|
|
if options.ReuseAddr {
|
|
listener.Control = control.Append(listener.Control, control.ReuseAddr())
|
|
listener.Control = control.Append(listener.Control, control.ReuseAddr())
|
|
@@ -179,6 +194,8 @@ func NewDefault(networkManager adapter.NetworkManager, options option.DialerOpti
|
|
isWireGuardListener: options.IsWireGuardListener,
|
|
isWireGuardListener: options.IsWireGuardListener,
|
|
networkManager: networkManager,
|
|
networkManager: networkManager,
|
|
networkStrategy: networkStrategy,
|
|
networkStrategy: networkStrategy,
|
|
|
|
+ networkType: networkType,
|
|
|
|
+ fallbackNetworkType: fallbackNetworkType,
|
|
networkFallbackDelay: networkFallbackDelay,
|
|
networkFallbackDelay: networkFallbackDelay,
|
|
}, nil
|
|
}, nil
|
|
}
|
|
}
|
|
@@ -202,11 +219,11 @@ func (d *DefaultDialer) DialContext(ctx context.Context, network string, address
|
|
return trackConn(DialSlowContext(&d.dialer6, ctx, network, address))
|
|
return trackConn(DialSlowContext(&d.dialer6, ctx, network, address))
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- return d.DialParallelInterface(ctx, network, address, d.networkStrategy, d.networkFallbackDelay)
|
|
|
|
|
|
+ return d.DialParallelInterface(ctx, network, address, d.networkStrategy, d.networkType, d.fallbackNetworkType, d.networkFallbackDelay)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network string, address M.Socksaddr, strategy C.NetworkStrategy, fallbackDelay time.Duration) (net.Conn, error) {
|
|
|
|
|
|
+func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network string, address M.Socksaddr, strategy C.NetworkStrategy, interfaceType []C.InterfaceType, fallbackInterfaceType []C.InterfaceType, fallbackDelay time.Duration) (net.Conn, error) {
|
|
if strategy == C.NetworkStrategyDefault {
|
|
if strategy == C.NetworkStrategyDefault {
|
|
return d.DialContext(ctx, network, address)
|
|
return d.DialContext(ctx, network, address)
|
|
}
|
|
}
|
|
@@ -226,9 +243,9 @@ func (d *DefaultDialer) DialParallelInterface(ctx context.Context, network strin
|
|
err error
|
|
err error
|
|
)
|
|
)
|
|
if !fastFallback {
|
|
if !fastFallback {
|
|
- conn, isPrimary, err = d.dialParallelInterface(ctx, dialer, network, address.String(), strategy, fallbackDelay)
|
|
|
|
|
|
+ conn, isPrimary, err = d.dialParallelInterface(ctx, dialer, network, address.String(), strategy, interfaceType, fallbackInterfaceType, fallbackDelay)
|
|
} else {
|
|
} else {
|
|
- conn, isPrimary, err = d.dialParallelInterfaceFastFallback(ctx, dialer, network, address.String(), strategy, fallbackDelay, d.networkLastFallback.Store)
|
|
|
|
|
|
+ conn, isPrimary, err = d.dialParallelInterfaceFastFallback(ctx, dialer, network, address.String(), strategy, interfaceType, fallbackInterfaceType, fallbackDelay, d.networkLastFallback.Store)
|
|
}
|
|
}
|
|
if err != nil {
|
|
if err != nil {
|
|
return nil, err
|
|
return nil, err
|
|
@@ -249,11 +266,11 @@ func (d *DefaultDialer) ListenPacket(ctx context.Context, destination M.Socksadd
|
|
return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4))
|
|
return trackPacketConn(d.udpListener.ListenPacket(ctx, N.NetworkUDP, d.udpAddr4))
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- return d.ListenSerialInterfacePacket(ctx, destination, d.networkStrategy, d.networkFallbackDelay)
|
|
|
|
|
|
+ return d.ListenSerialInterfacePacket(ctx, destination, d.networkStrategy, d.networkType, d.fallbackNetworkType, d.networkFallbackDelay)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func (d *DefaultDialer) ListenSerialInterfacePacket(ctx context.Context, destination M.Socksaddr, strategy C.NetworkStrategy, fallbackDelay time.Duration) (net.PacketConn, error) {
|
|
|
|
|
|
+func (d *DefaultDialer) ListenSerialInterfacePacket(ctx context.Context, destination M.Socksaddr, strategy C.NetworkStrategy, interfaceType []C.InterfaceType, fallbackInterfaceType []C.InterfaceType, fallbackDelay time.Duration) (net.PacketConn, error) {
|
|
if strategy == C.NetworkStrategyDefault {
|
|
if strategy == C.NetworkStrategyDefault {
|
|
return d.ListenPacket(ctx, destination)
|
|
return d.ListenPacket(ctx, destination)
|
|
}
|
|
}
|
|
@@ -264,11 +281,11 @@ func (d *DefaultDialer) ListenSerialInterfacePacket(ctx context.Context, destina
|
|
if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
|
|
if destination.IsIPv4() && !destination.Addr.IsUnspecified() {
|
|
network += "4"
|
|
network += "4"
|
|
}
|
|
}
|
|
- return trackPacketConn(d.listenSerialInterfacePacket(ctx, d.udpListener, network, "", strategy, fallbackDelay))
|
|
|
|
|
|
+ return trackPacketConn(d.listenSerialInterfacePacket(ctx, d.udpListener, network, "", strategy, interfaceType, fallbackInterfaceType, fallbackDelay))
|
|
}
|
|
}
|
|
|
|
|
|
func (d *DefaultDialer) ListenPacketCompat(network, address string) (net.PacketConn, error) {
|
|
func (d *DefaultDialer) ListenPacketCompat(network, address string) (net.PacketConn, error) {
|
|
- return d.listenSerialInterfacePacket(context.Background(), d.udpListener, network, address, d.networkStrategy, d.networkFallbackDelay)
|
|
|
|
|
|
+ return d.listenSerialInterfacePacket(context.Background(), d.udpListener, network, address, d.networkStrategy, d.networkType, d.fallbackNetworkType, d.networkFallbackDelay)
|
|
}
|
|
}
|
|
|
|
|
|
func trackConn(conn net.Conn, err error) (net.Conn, error) {
|
|
func trackConn(conn net.Conn, err error) (net.Conn, error) {
|