From 028eb3d81d192cb03e24301323ac5365839a441c Mon Sep 17 00:00:00 2001
From: xiaorouji <60100640+xiaorouji@users.noreply.github.com>
Date: Sat, 26 Aug 2023 14:42:51 +0800
Subject: [PATCH] luci: fixed
 https://github.com/xiaorouji/openwrt-passwall/issues/2716

---
 luci-app-passwall/Makefile                            | 2 +-
 luci-app-passwall/root/usr/share/passwall/nftables.sh | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index 9c32f3cf1..983b0a236 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=4.68-4
+PKG_VERSION:=4.68-5
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh
index 3fe68c576..7b995f021 100755
--- a/luci-app-passwall/root/usr/share/passwall/nftables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh
@@ -183,10 +183,10 @@ get_redirect_ipv6() {
 		echo "ip6 daddr @$NFTSET_GFW6 $(REDIRECT $2 $3)"
 		;;
 	chnroute)
-		echo "ip6 daddr != $NFTSET_CHN6 $(REDIRECT $2 $3)"
+		echo "ip6 daddr != @$NFTSET_CHN6 $(REDIRECT $2 $3)"
 		;;
 	returnhome)
-		echo "ip6 daddr $NFTSET_CHN6 $(REDIRECT $2 $3)"
+		echo "ip6 daddr @$NFTSET_CHN6 $(REDIRECT $2 $3)"
 		;;
 	esac
 }
@@ -1144,8 +1144,9 @@ del_firewall_rule() {
 
 flush_nftset() {
 	del_firewall_rule
-	destroy_nftset $NFTSET_VPSLIST $NFTSET_SHUNTLIST $NFTSET_GFW $NFTSET_CHN $NFTSET_BLACKLIST $NFTSET_BLOCKLIST $NFTSET_WHITELIST $NFTSET_LANLIST
-	destroy_nftset $NFTSET_VPSLIST6 $NFTSET_SHUNTLIST6 $NFTSET_GFW6 $NFTSET_CHN6 $NFTSET_BLACKLIST6 $NFTSET_BLOCKLIST6 $NFTSET_WHITELIST6 $NFTSET_LANLIST6
+	for _name in $(nft -a list sets | grep -E "passwall" | awk -F 'set ' '{print $2}' | awk '{print $1}'); do
+		destroy_nftset ${_name}
+	done
 	rm -rf /tmp/etc/passwall_tmp/dnsmasq*
 	/etc/init.d/passwall reload
 }