From 0b84c145d8d9403b106ac493fb44a65a0a7a5e64 Mon Sep 17 00:00:00 2001
From: ZiMing Mo <msylgj@immortalwrt.org>
Date: Wed, 25 May 2022 14:14:15 +0800
Subject: [PATCH] dnsmasq: use inet family & fix ruleset order

---
 .../network/services/dnsmasq/files/dnsmasq.init   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 95a33d90ea..7dbb53158f 100755
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -1190,15 +1190,9 @@ dnsmasq_start()
 	config_get dns_port "$cfg" port 53
 	if [ "$dns_redirect" = 1 ]; then
 		cat > /tmp/dnsmasq-dns-redirect.nft <<EOF
-table ip dnsmasq {
+table inet dnsmasq {
 	chain prerouting {
-		type nat hook prerouting priority dstnat; policy accept;
-		udp dport 53 counter redirect to :$dns_port comment "DNSMASQ";
-	}
-}
-table ip6 dnsmasq {
-	chain prerouting {
-		type nat hook prerouting priority dstnat; policy accept;
+		type nat hook prerouting priority -105; policy accept;
 		udp dport 53 counter redirect to :$dns_port comment "DNSMASQ";
 	}
 }
@@ -1224,11 +1218,10 @@ dnsmasq_stop()
 
 nftables_clear()
 {
-	nft --check list table ip dnsmasq > /dev/null 2>&1
+	nft --check list table inet dnsmasq > /dev/null 2>&1
 	if [ $? -eq "0" ]; then
 		echo "Remove dnsmasq nat table"
-		nft delete table ip dnsmasq
-		nft delete table ip6 dnsmasq
+		nft delete table inet dnsmasq
 	fi
 }