From f24ca07640da5d81de2b3eced88c372688240fea Mon Sep 17 00:00:00 2001
From: Paul Chambers <paul@chambers.name>
Date: Sat, 31 Aug 2019 23:22:30 -0700
Subject: [PATCH] Fix the error messages produced by nft_init.sh in normal
 operation. Simplify the script.

---
 miniupnpd/netfilter_nft/scripts/nft_init.sh | 60 +++++++--------------
 1 file changed, 18 insertions(+), 42 deletions(-)

diff --git a/miniupnpd/netfilter_nft/scripts/nft_init.sh b/miniupnpd/netfilter_nft/scripts/nft_init.sh
index 938f5d7..a81dd40 100755
--- a/miniupnpd/netfilter_nft/scripts/nft_init.sh
+++ b/miniupnpd/netfilter_nft/scripts/nft_init.sh
@@ -1,47 +1,23 @@
 #!/bin/sh
+#
+# establish the chains that miniupnpd will update dynamically
+#
+# 'add' doesn't raise an error if the object already exists. 'create' does.
+#
 
-nft list table nat > /dev/null
-nft_nat_exists=$?
-nft list table inet filter > /dev/null
-nft_filter_exists=$?
-#nft list table inet mangle > /dev/null
-#nft_mangle_exists=$?
+#opts="--echo"
 
-if [ $nft_nat_exists -eq "1" ]; then
-	echo "create nat"
-	nft "add table nat"
-fi
-if [ $nft_filter_exists -eq "1" ]; then
-	echo "create filter"
-	nft "add table inet filter"
-fi
-#if [ $nft_mangle_exists -eq "1" ]; then
-#	echo "create mangle"
-#	nft "add table mangle"
-#fi
+echo "create nat table"
+nft ${opts} add table nat
 
-nft list chain nat MINIUPNPD > /dev/null
-nft_nat_miniupnpd_exists=$?
-nft list chain nat MINIUPNPD-POSTROUTING > /dev/null
-nft_nat_miniupnpd_pcp_peer_exists=$?
-nft list chain inet filter MINIUPNPD > /dev/null
-nft_filter_miniupnpd_exists=$?
-#nft list chain inet mangle MINIUPNPD > /dev/null
-#nft_mangle_miniupnpd_exists=$?
+echo "create chain in nat table"
+nft ${opts} add chain nat MINIUPNPD
 
-if [ $nft_nat_miniupnpd_exists -eq "1" ]; then
-	echo "create chain in nat"
-	nft "add chain nat MINIUPNPD"
-fi
-if [ $nft_nat_miniupnpd_pcp_peer_exists -eq "1" ]; then
-	echo "create pcp peer chain in nat"
-	nft "add chain nat MINIUPNPD-POSTROUTING"
-fi
-if [ $nft_filter_miniupnpd_exists -eq "1" ]; then
-	echo "create chain in filter "
-	nft "add chain inet filter MINIUPNPD"
-fi
-#if [ $nft_mangle_miniupnpd_exists -eq "1" ]; then
-#	echo "create chain in mangle"
-#	nft "add chain inet mangle MINIUPNPD"
-#fi
+echo "create pcp peer chain in nat table"
+nft ${opts} add chain nat MINIUPNPD-POSTROUTING
+
+echo "create filter table"
+nft ${opts} add table inet filter
+
+echo "create chain in filter table"
+nft ${opts} add chain inet filter MINIUPNPD