eburet-oss/sing-tun-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto-redirect: Fix nftables available check

Browse source
This commit is contained in:
世界 2024-07-04 00:07:40 +08:00
parent 60a8276dc4
commit 5d440412ba
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
redirect_linux.go
View file

@ -6,7 +6,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"runtime" "runtime"
"time"
"github.com/sagernet/nftables" "github.com/sagernet/nftables"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
@ -81,7 +80,8 @@ func NewAutoRedirect(options AutoRedirectOptions) (AutoRedirect, error) {
if r.useNFTables { if r.useNFTables {
err = r.initializeNFTables() err = r.initializeNFTables()
if err != nil && err != os.ErrInvalid { if err != nil && err != os.ErrInvalid {
r.logger.Debug("device has no nftables support: ", err) r.useNFTables = false
r.logger.Debug("missing nftables support: ", err)
} }
} }
if len(r.tunOptions.Inet4Address) > 0 { if len(r.tunOptions.Inet4Address) > 0 {
@ -131,7 +131,6 @@ func (r *autoRedirect) Start() error {
} }
r.redirectServer = server r.redirectServer = server
} }
startAt := time.Now()
var err error var err error
if r.useNFTables { if r.useNFTables {
r.cleanupNFTables() r.cleanupNFTables()
@ -140,12 +139,8 @@ func (r *autoRedirect) Start() error {
r.cleanupIPTables() r.cleanupIPTables()
err = r.setupIPTables() err = r.setupIPTables()
} }
if err != nil {
return err return err
} }
r.logger.Debug("auto-redirect configured in ", time.Since(startAt))
return nil
}
func (r *autoRedirect) Close() error { func (r *autoRedirect) Close() error {
if r.useNFTables { if r.useNFTables {