SagerNet/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-04-04 12:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add StackOptions.IncludeAllNetworks

Browse source
This commit is contained in:
世界 2024-05-07 20:20:44 +08:00
parent e272ff0ad3
commit fb6e917a2c
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
stack.go
View file

@ -25,6 +25,7 @@ type StackOptions struct {
Handler Handler Handler Handler
Logger logger.Logger Logger logger.Logger
ForwarderBindInterface bool ForwarderBindInterface bool
IncludeAllNetworks bool
InterfaceFinder control.InterfaceFinder InterfaceFinder control.InterfaceFinder
} }
@ -34,7 +35,9 @@ func NewStack(
) (Stack, error) { ) (Stack, error) {
switch stack { switch stack {
case "": case "":
if WithGVisor && !options.TunOptions.GSO { if options.IncludeAllNetworks {
return NewGVisor(options)
} else if WithGVisor && !options.TunOptions.GSO {
return NewMixed(options) return NewMixed(options)
} else { } else {
return NewSystem(options) return NewSystem(options)
@ -42,8 +45,14 @@ func NewStack(
case "gvisor": case "gvisor":
return NewGVisor(options) return NewGVisor(options)
case "mixed": case "mixed":
if options.IncludeAllNetworks {
return nil, ErrIncludeAllNetworks
}
return NewMixed(options) return NewMixed(options)
case "system": case "system":
if options.IncludeAllNetworks {
return nil, ErrIncludeAllNetworks
}
return NewSystem(options) return NewSystem(options)
default: default:
return nil, E.New("unknown stack: ", stack) return nil, E.New("unknown stack: ", stack)

2
stack_system.go
View file

@ -18,6 +18,8 @@ import (
"github.com/sagernet/sing/common/udpnat" "github.com/sagernet/sing/common/udpnat"
) )
var ErrIncludeAllNetworks = E.New("`system` and `mixed` stack are not available when `includeAllNetworks` is enabled. See https://github.com/SagerNet/sing-tun/issues/25")
type System struct { type System struct {
ctx context.Context ctx context.Context
tun Tun tun Tun