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

Fix auto_redirect fallback rule

Browse Source
This commit is contained in:
世界
2026-01-29 12:07:15 +08:00
parent 99cad72ea8
commit 58025a01f8
7 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changelog.md
View File

@@ -4,8 +4,16 @@ icon: material/alert-decagram
#### 1.12.18 #### 1.12.18
* Add fallback routing rule for `auto_redirect` **1**
* Fixes and improvements * Fixes and improvements
**1**:
Adds a fallback iproute2 rule checked after system default rules (32766: main, 32767: default),
ensuring traffic is routed to the sing-box table when no route is found in system tables.
The rule index can be customized via `auto_redirect_iproute2_fallback_rule_index` (default: 32768).
#### 1.12.17 #### 1.12.17
* Update uTLS to v1.8.2 **1** * Update uTLS to v1.8.2 **1**

16
docs/configuration/inbound/tun.md
View File

@@ -2,6 +2,10 @@
icon: material/new-box icon: material/new-box
--- ---
!!! quote "Changes in sing-box 1.12.18"
:material-plus: [auto_redirect_iproute2_fallback_rule_index](#auto_redirect_iproute2_fallback_rule_index)
!!! quote "Changes in sing-box 1.12.0" !!! quote "Changes in sing-box 1.12.0"
:material-plus: [loopback_address](#loopback_address) :material-plus: [loopback_address](#loopback_address)
@@ -63,6 +67,7 @@ icon: material/new-box
"auto_redirect": true, "auto_redirect": true,
"auto_redirect_input_mark": "0x2023", "auto_redirect_input_mark": "0x2023",
"auto_redirect_output_mark": "0x2024", "auto_redirect_output_mark": "0x2024",
"auto_redirect_iproute2_fallback_rule_index": 32768,
"loopback_address": [ "loopback_address": [
"10.7.0.1" "10.7.0.1"
], ],
@@ -278,6 +283,17 @@ Connection output mark used by `auto_redirect`.
`0x2024` is used by default. `0x2024` is used by default.
#### auto_redirect_iproute2_fallback_rule_index
!!! question "Since sing-box 1.12.18"
Linux iproute2 fallback rule index generated by `auto_redirect`.
This rule is checked after system default rules (32766: main, 32767: default),
routing traffic to the sing-box table only when no route is found in system tables.
`32768` is used by default.
#### loopback_address #### loopback_address
!!! question "Since sing-box 1.12.0" !!! question "Since sing-box 1.12.0"

16
docs/configuration/inbound/tun.zh.md
View File

@@ -2,6 +2,10 @@
icon: material/new-box icon: material/new-box
--- ---
!!! quote "sing-box 1.12.18 中的更改"
:material-plus: [auto_redirect_iproute2_fallback_rule_index](#auto_redirect_iproute2_fallback_rule_index)
!!! quote "sing-box 1.12.0 中的更改" !!! quote "sing-box 1.12.0 中的更改"
:material-plus: [loopback_address](#loopback_address) :material-plus: [loopback_address](#loopback_address)
@@ -63,6 +67,7 @@ icon: material/new-box
"auto_redirect": true, "auto_redirect": true,
"auto_redirect_input_mark": "0x2023", "auto_redirect_input_mark": "0x2023",
"auto_redirect_output_mark": "0x2024", "auto_redirect_output_mark": "0x2024",
"auto_redirect_iproute2_fallback_rule_index": 32768,
"loopback_address": [ "loopback_address": [
"10.7.0.1" "10.7.0.1"
], ],
@@ -277,6 +282,17 @@ tun 接口的 IPv6 前缀。
默认使用 `0x2024`。 默认使用 `0x2024`。
#### auto_redirect_iproute2_fallback_rule_index
!!! question "自 sing-box 1.12.18 起"
`auto_redirect` 生成的 iproute2 回退规则索引。
此规则在系统默认规则（32766: main，32767: default）之后检查，
仅当系统路由表中未找到路由时才将流量路由到 sing-box 路由表。
默认使用 `32768`。
#### loopback_address #### loopback_address
!!! question "自 sing-box 1.12.0 起" !!! question "自 sing-box 1.12.0 起"

2
go.mod
View File

@@ -33,7 +33,7 @@ require (
github.com/sagernet/sing-shadowsocks v0.2.8 github.com/sagernet/sing-shadowsocks v0.2.8
github.com/sagernet/sing-shadowsocks2 v0.2.1 github.com/sagernet/sing-shadowsocks2 v0.2.1
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11
github.com/sagernet/sing-tun v0.7.8 github.com/sagernet/sing-tun v0.7.9
github.com/sagernet/sing-vmess v0.2.7 github.com/sagernet/sing-vmess v0.2.7
github.com/sagernet/smux v1.5.50-sing-box-mod.1 github.com/sagernet/smux v1.5.50-sing-box-mod.1
github.com/sagernet/tailscale v1.80.3-sing-box-1.12-mod.2 github.com/sagernet/tailscale v1.80.3-sing-box-1.12-mod.2

4
go.sum
View File

@@ -177,8 +177,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.1 h1:dWV9OXCeFPuYGHb6IRqlSptVnSzOelnq
github.com/sagernet/sing-shadowsocks2 v0.2.1/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ= github.com/sagernet/sing-shadowsocks2 v0.2.1/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 h1:tK+75l64tm9WvEFrYRE1t0YxoFdWQqw/h7Uhzj0vJ+w= github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 h1:tK+75l64tm9WvEFrYRE1t0YxoFdWQqw/h7Uhzj0vJ+w=
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11/go.mod h1:sWqKnGlMipCHaGsw1sTTlimyUpgzP4WP3pjhCsYt9oA= github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11/go.mod h1:sWqKnGlMipCHaGsw1sTTlimyUpgzP4WP3pjhCsYt9oA=
github.com/sagernet/sing-tun v0.7.8 h1:v9GYPL6V1ZiViqdoRYOy1MPE9b2E6SP0YYWCIGV5fGc= github.com/sagernet/sing-tun v0.7.9 h1:kcEFA0Xa+OVcrBGnlIl33+SrW/vuB3jtOw0HQNOSJzc=
github.com/sagernet/sing-tun v0.7.8/go.mod h1:pUEjh9YHQ2gJT6Lk0TYDklh3WJy7lz+848vleGM3JPM= github.com/sagernet/sing-tun v0.7.9/go.mod h1:pUEjh9YHQ2gJT6Lk0TYDklh3WJy7lz+848vleGM3JPM=
github.com/sagernet/sing-vmess v0.2.7 h1:2ee+9kO0xW5P4mfe6TYVWf9VtY8k1JhNysBqsiYj0sk= github.com/sagernet/sing-vmess v0.2.7 h1:2ee+9kO0xW5P4mfe6TYVWf9VtY8k1JhNysBqsiYj0sk=
github.com/sagernet/sing-vmess v0.2.7/go.mod h1:5aYoOtYksAyS0NXDm0qKeTYW1yoE1bJVcv+XLcVoyJs= github.com/sagernet/sing-vmess v0.2.7/go.mod h1:5aYoOtYksAyS0NXDm0qKeTYW1yoE1bJVcv+XLcVoyJs=
github.com/sagernet/smux v1.5.50-sing-box-mod.1 h1:XkJcivBC9V4wBjiGXIXZ229aZCU1hzcbp6kSkkyQ478= github.com/sagernet/smux v1.5.50-sing-box-mod.1 h1:XkJcivBC9V4wBjiGXIXZ229aZCU1hzcbp6kSkkyQ478=

55
option/tun.go
View File

@@ -11,33 +11,34 @@ import (
) )
type TunInboundOptions struct { type TunInboundOptions struct {
InterfaceName string `json:"interface_name,omitempty"` InterfaceName string `json:"interface_name,omitempty"`
MTU uint32 `json:"mtu,omitempty"` MTU uint32 `json:"mtu,omitempty"`
Address badoption.Listable[netip.Prefix] `json:"address,omitempty"` Address badoption.Listable[netip.Prefix] `json:"address,omitempty"`
AutoRoute bool `json:"auto_route,omitempty"` AutoRoute bool `json:"auto_route,omitempty"`
IPRoute2TableIndex int `json:"iproute2_table_index,omitempty"` IPRoute2TableIndex int `json:"iproute2_table_index,omitempty"`
IPRoute2RuleIndex int `json:"iproute2_rule_index,omitempty"` IPRoute2RuleIndex int `json:"iproute2_rule_index,omitempty"`
AutoRedirect bool `json:"auto_redirect,omitempty"` AutoRedirect bool `json:"auto_redirect,omitempty"`
AutoRedirectInputMark FwMark `json:"auto_redirect_input_mark,omitempty"` AutoRedirectInputMark FwMark `json:"auto_redirect_input_mark,omitempty"`
AutoRedirectOutputMark FwMark `json:"auto_redirect_output_mark,omitempty"` AutoRedirectOutputMark FwMark `json:"auto_redirect_output_mark,omitempty"`
LoopbackAddress badoption.Listable[netip.Addr] `json:"loopback_address,omitempty"` AutoRedirectIPRoute2FallbackRuleIndex int `json:"auto_redirect_iproute2_fallback_rule_index,omitempty"`
StrictRoute bool `json:"strict_route,omitempty"` LoopbackAddress badoption.Listable[netip.Addr] `json:"loopback_address,omitempty"`
RouteAddress badoption.Listable[netip.Prefix] `json:"route_address,omitempty"` StrictRoute bool `json:"strict_route,omitempty"`
RouteAddressSet badoption.Listable[string] `json:"route_address_set,omitempty"` RouteAddress badoption.Listable[netip.Prefix] `json:"route_address,omitempty"`
RouteExcludeAddress badoption.Listable[netip.Prefix] `json:"route_exclude_address,omitempty"` RouteAddressSet badoption.Listable[string] `json:"route_address_set,omitempty"`
RouteExcludeAddressSet badoption.Listable[string] `json:"route_exclude_address_set,omitempty"` RouteExcludeAddress badoption.Listable[netip.Prefix] `json:"route_exclude_address,omitempty"`
IncludeInterface badoption.Listable[string] `json:"include_interface,omitempty"` RouteExcludeAddressSet badoption.Listable[string] `json:"route_exclude_address_set,omitempty"`
ExcludeInterface badoption.Listable[string] `json:"exclude_interface,omitempty"` IncludeInterface badoption.Listable[string] `json:"include_interface,omitempty"`
IncludeUID badoption.Listable[uint32] `json:"include_uid,omitempty"` ExcludeInterface badoption.Listable[string] `json:"exclude_interface,omitempty"`
IncludeUIDRange badoption.Listable[string] `json:"include_uid_range,omitempty"` IncludeUID badoption.Listable[uint32] `json:"include_uid,omitempty"`
ExcludeUID badoption.Listable[uint32] `json:"exclude_uid,omitempty"` IncludeUIDRange badoption.Listable[string] `json:"include_uid_range,omitempty"`
ExcludeUIDRange badoption.Listable[string] `json:"exclude_uid_range,omitempty"` ExcludeUID badoption.Listable[uint32] `json:"exclude_uid,omitempty"`
IncludeAndroidUser badoption.Listable[int] `json:"include_android_user,omitempty"` ExcludeUIDRange badoption.Listable[string] `json:"exclude_uid_range,omitempty"`
IncludePackage badoption.Listable[string] `json:"include_package,omitempty"` IncludeAndroidUser badoption.Listable[int] `json:"include_android_user,omitempty"`
ExcludePackage badoption.Listable[string] `json:"exclude_package,omitempty"` IncludePackage badoption.Listable[string] `json:"include_package,omitempty"`
UDPTimeout UDPTimeoutCompat `json:"udp_timeout,omitempty"` ExcludePackage badoption.Listable[string] `json:"exclude_package,omitempty"`
Stack string `json:"stack,omitempty"` UDPTimeout UDPTimeoutCompat `json:"udp_timeout,omitempty"`
Platform *TunPlatformOptions `json:"platform,omitempty"` Stack string `json:"stack,omitempty"`
Platform *TunPlatformOptions `json:"platform,omitempty"`
InboundOptions InboundOptions
// Deprecated: removed // Deprecated: removed

57
protocol/tun/inbound.go
View File

@@ -174,6 +174,10 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
if ruleIndex == 0 { if ruleIndex == 0 {
ruleIndex = tun.DefaultIPRoute2RuleIndex ruleIndex = tun.DefaultIPRoute2RuleIndex
} }
autoRedirectFallbackRuleIndex := options.AutoRedirectIPRoute2FallbackRuleIndex
if autoRedirectFallbackRuleIndex == 0 {
autoRedirectFallbackRuleIndex = tun.DefaultIPRoute2AutoRedirectFallbackRuleIndex
}
inputMark := uint32(options.AutoRedirectInputMark) inputMark := uint32(options.AutoRedirectInputMark)
if inputMark == 0 { if inputMark == 0 {
inputMark = tun.DefaultAutoRedirectInputMark inputMark = tun.DefaultAutoRedirectInputMark
@@ -192,32 +196,33 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
logger: logger, logger: logger,
inboundOptions: options.InboundOptions, inboundOptions: options.InboundOptions,
tunOptions: tun.Options{ tunOptions: tun.Options{
Name: options.InterfaceName, Name: options.InterfaceName,
MTU: tunMTU, MTU: tunMTU,
GSO: enableGSO, GSO: enableGSO,
Inet4Address: inet4Address, Inet4Address: inet4Address,
Inet6Address: inet6Address, Inet6Address: inet6Address,
AutoRoute: options.AutoRoute, AutoRoute: options.AutoRoute,
IPRoute2TableIndex: tableIndex, IPRoute2TableIndex: tableIndex,
IPRoute2RuleIndex: ruleIndex, IPRoute2RuleIndex: ruleIndex,
AutoRedirectInputMark: inputMark, IPRoute2AutoRedirectFallbackRuleIndex: autoRedirectFallbackRuleIndex,
AutoRedirectOutputMark: outputMark, AutoRedirectInputMark: inputMark,
Inet4LoopbackAddress: common.Filter(options.LoopbackAddress, netip.Addr.Is4), AutoRedirectOutputMark: outputMark,
Inet6LoopbackAddress: common.Filter(options.LoopbackAddress, netip.Addr.Is6), Inet4LoopbackAddress: common.Filter(options.LoopbackAddress, netip.Addr.Is4),
StrictRoute: options.StrictRoute, Inet6LoopbackAddress: common.Filter(options.LoopbackAddress, netip.Addr.Is6),
IncludeInterface: options.IncludeInterface, StrictRoute: options.StrictRoute,
ExcludeInterface: options.ExcludeInterface, IncludeInterface: options.IncludeInterface,
Inet4RouteAddress: inet4RouteAddress, ExcludeInterface: options.ExcludeInterface,
Inet6RouteAddress: inet6RouteAddress, Inet4RouteAddress: inet4RouteAddress,
Inet4RouteExcludeAddress: inet4RouteExcludeAddress, Inet6RouteAddress: inet6RouteAddress,
Inet6RouteExcludeAddress: inet6RouteExcludeAddress, Inet4RouteExcludeAddress: inet4RouteExcludeAddress,
IncludeUID: includeUID, Inet6RouteExcludeAddress: inet6RouteExcludeAddress,
ExcludeUID: excludeUID, IncludeUID: includeUID,
IncludeAndroidUser: options.IncludeAndroidUser, ExcludeUID: excludeUID,
IncludePackage: options.IncludePackage, IncludeAndroidUser: options.IncludeAndroidUser,
ExcludePackage: options.ExcludePackage, IncludePackage: options.IncludePackage,
InterfaceMonitor: networkManager.InterfaceMonitor(), ExcludePackage: options.ExcludePackage,
EXP_MultiPendingPackets: multiPendingPackets, InterfaceMonitor: networkManager.InterfaceMonitor(),
EXP_MultiPendingPackets: multiPendingPackets,
}, },
udpTimeout: udpTimeout, udpTimeout: udpTimeout,
stack: options.Stack, stack: options.Stack,