Fix the error messages produced by nft_init.sh in normal operation. Simplify the script.

This commit is contained in:
Paul Chambers 2019-08-31 23:22:30 -07:00
parent 60b57a442a
commit f24ca07640
1 changed files with 18 additions and 42 deletions

View File

@ -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