olsrd: switch to firewall4

Firewall4 uses nftables instead of iptables. Use iptables-nft for installing smart-gw-rules. Fixes: openwrt#731 ("Certain upstream switch to firewall4 aka nftables instead of iptables") Signed-off-by: Nick Hainke <[email protected]>
PolynomialDivision · Feb 27, 2022 · 1b6b87c · 1b6b87c
1 parent 699106a
commit 1b6b87c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/olsrd/Makefile b/olsrd/Makefile
@@ -34,7 +34,7 @@ endef
 define Package/olsrd
   $(call Package/olsrd/template)
   MENU:=1
-  DEPENDS:=+libpthread +libubus
+  DEPENDS:=+libpthread +libubus +iptables-nft +ip6tables-nft
 endef
 
 define Package/olsrd/conffiles

diff --git a/olsrd/files/olsrd.sh b/olsrd/files/olsrd.sh
@@ -746,8 +746,8 @@ olsrd_setup_smartgw_rules() {
 		nowan=0
 	fi
 
-	IP4T="$( command -v iptables )"
-	IP6T="$( command -v ip6tables )"
+	IP4T="$( command -v iptables-nft )"
+	IP6T="$( command -v ip6tables-nft )"
 
 	# Delete smartgw firewall rules first
 	if [ "$UCI_CONF_NAME" = "olsrd6" ]; then