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

Ignore system bind error

Browse source
This commit is contained in:
世界 2023-04-20 09:09:11 +08:00
parent 9c6e70b7cc
commit 8bf4113343
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stack.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"net/netip" "net/netip"
"github.com/sagernet/sing/common/control"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/logger" "github.com/sagernet/sing/common/logger"
) )
@ -25,7 +26,8 @@ type StackOptions struct {
Router Router Router Router
Handler Handler Handler Handler
Logger logger.Logger Logger logger.Logger
UnderPlatform bool ForwarderBindInterface bool
InterfaceFinder control.InterfaceFinder
} }
func NewStack( func NewStack(

36
system.go
View file

@ -40,7 +40,8 @@ type System struct {
tcpNat *TCPNat tcpNat *TCPNat
udpNat *udpnat.Service[netip.AddrPort] udpNat *udpnat.Service[netip.AddrPort]
routeMapping *RouteMapping routeMapping *RouteMapping
underPlatform bool bindInterface bool
interfaceFinder control.InterfaceFinder
} }
type Session struct { type Session struct {
@ -52,17 +53,18 @@ type Session struct {
func NewSystem(options StackOptions) (Stack, error) { func NewSystem(options StackOptions) (Stack, error) {
stack := &System{ stack := &System{
ctx: options.Context, ctx: options.Context,
tun: options.Tun, tun: options.Tun,
tunName: options.Name, tunName: options.Name,
mtu: options.MTU, mtu: options.MTU,
udpTimeout: options.UDPTimeout, udpTimeout: options.UDPTimeout,
router: options.Router, router: options.Router,
handler: options.Handler, handler: options.Handler,
logger: options.Logger, logger: options.Logger,
inet4Prefixes: options.Inet4Address, inet4Prefixes: options.Inet4Address,
inet6Prefixes: options.Inet6Address, inet6Prefixes: options.Inet6Address,
underPlatform: options.UnderPlatform, bindInterface: options.ForwarderBindInterface,
interfaceFinder: options.InterfaceFinder,
} }
if stack.router != nil { if stack.router != nil {
stack.routeMapping = NewRouteMapping(options.UDPTimeout) stack.routeMapping = NewRouteMapping(options.UDPTimeout)
@ -96,8 +98,14 @@ func (s *System) Close() error {
func (s *System) Start() error { func (s *System) Start() error {
var listener net.ListenConfig var listener net.ListenConfig
if s.underPlatform { if s.bindInterface {
listener.Control = control.Append(listener.Control, control.BindToInterface(control.DefaultInterfaceFinder(), s.tunName, -1)) listener.Control = control.Append(listener.Control, func(network, address string, conn syscall.RawConn) error {
err := control.BindToInterface(s.interfaceFinder, s.tunName, -1)(network, address, conn)
if err != nil {
s.logger.Warn("bind forwarder to interface: ", err)
}
return nil
})
} }
if s.inet4Address.IsValid() { if s.inet4Address.IsValid() {
tcpListener, err := listener.Listen(s.ctx, "tcp4", net.JoinHostPort(s.inet4ServerAddress.String(), "0")) tcpListener, err := listener.Listen(s.ctx, "tcp4", net.JoinHostPort(s.inet4ServerAddress.String(), "0"))