From 5d440412bab72a72295ad376f90c3bc6caf02b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Thu, 4 Jul 2024 00:07:40 +0800
Subject: [PATCH] auto-redirect: Fix nftables available check

---
 redirect_linux.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/redirect_linux.go b/redirect_linux.go
index e5c8f27..6c3706e 100644
--- a/redirect_linux.go
+++ b/redirect_linux.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"time"
 
 	"github.com/sagernet/nftables"
 	"github.com/sagernet/sing/common"
@@ -81,7 +80,8 @@ func NewAutoRedirect(options AutoRedirectOptions) (AutoRedirect, error) {
 		if r.useNFTables {
 			err = r.initializeNFTables()
 			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 {
@@ -131,7 +131,6 @@ func (r *autoRedirect) Start() error {
 		}
 		r.redirectServer = server
 	}
-	startAt := time.Now()
 	var err error
 	if r.useNFTables {
 		r.cleanupNFTables()
@@ -140,11 +139,7 @@ func (r *autoRedirect) Start() error {
 		r.cleanupIPTables()
 		err = r.setupIPTables()
 	}
-	if err != nil {
-		return err
-	}
-	r.logger.Debug("auto-redirect configured in ", time.Since(startAt))
-	return nil
+	return err
 }
 
 func (r *autoRedirect) Close() error {