hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-26 13:06:56 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

Add netns and unshare support

Browse Source
This commit is contained in:
世界
2026-08-30 17:41:42 +08:00
parent 7b3993db12
commit 9531a6a9cd
34 changed files with 891 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/tun/inbound.go
+15 -3
View File
@@ -98,6 +98,9 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
})
platformInterface := service.FromContext[adapter.PlatformInterface](ctx)
if options.NetNs != "" && !C.IsLinux {
return nil, E.New("`netns` is only supported on Linux")
}
tunMTU := options.MTU
if tunMTU == 0 {
if platformInterface != nil && platformInterface.UnderNetworkExtension() {
@@ -190,6 +193,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
logger: logger,
tunOptions: tun.Options{
Name: options.InterfaceName,
NetNs: options.NetNs,
MTU: tunMTU,
GSO: enableGSO,
Inet4Address: inet4Address,
@@ -266,9 +270,11 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
}
if !C.IsAndroid {
inbound.tunOptions.AutoRedirectMarkMode = true
err = networkManager.RegisterAutoRedirectOutputMark(inbound.tunOptions.AutoRedirectOutputMark)
if err != nil {
return nil, err
if options.NetNs == "" {
err = networkManager.RegisterAutoRedirectOutputMark(inbound.tunOptions.AutoRedirectOutputMark)
if err != nil {
return nil, err
}
}
}
}
@@ -355,6 +361,12 @@ func (t *Inbound) Start(stage adapter.StartStage) error {
if t.tunOptions.Name == "" {
t.tunOptions.Name = tun.CalculateInterfaceName("")
}
if t.tunOptions.NetNs != "" {
manager := service.FromContext[adapter.NetworkNamespaceManager](t.ctx)
if manager != nil {
t.tunOptions.NetNs = manager.ResolvePath(t.tunOptions.NetNs)
}
}
if t.platformInterface == nil {
for _, routeRuleSet := range t.routeRuleSet {
ipSets := routeRuleSet.ExtractIPSet()