status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #586 from f1sherman/a-few-nftables-fixes 

A few nftables fixes :

    Spelling fix: routeing --> routing
    Fix typo where we're incorrectly checking for $TABLE instead of $NAT_TABLE in nft_removeall.sh
    Split NAT and TABLE everywhere for consistency
This commit is contained in:
Thomas BERNARD 2022-01-22 19:30:10 +01:00 committed by GitHub
parent 327c400e4f 87776e8345
commit 3f51c41ea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miniupnpd/miniupnpd.conf
View File

@ -75,7 +75,7 @@
# table names for netfilter nft. Default is "filter" for both
#upnp_table_name=
#upnp_nattable_name=
#upnp_nat_table_name=
# chain names for netfilter and netfilter nft
# netfilter : default are MINIUPNPD, MINIUPNPD, MINIUPNPD-POSTROUTING
# netfilter nft : default are miniupnpd, prerouting_miniupnpd, postrouting_miniupnpd

2
miniupnpd/netfilter_nft/README.md
View File

@ -68,7 +68,7 @@ The following is used in miniupnpd for a table setup but it can be customized:
and the following config settings can be used to change the tables and chains :
upnp_table_name=filter
upnp_nattable_name=filter
upnp_nat_table_name=filter
upnp_forward_chain=miniupnpd
upnp_nat_chain=prerouting_miniupnpd
upnp_nat_postrouting_chain=postrouting_miniupnpd

8
miniupnpd/netfilter_nft/scripts/miniupnpd_functions.sh
View File

@ -8,8 +8,8 @@ NFT=$(which nft) || {
TABLE="filter"
NAT_TABLE="filter"
CHAIN="miniupnpd"
PREROUTEING_CHAIN="prerouting_miniupnpd"
POSTROUTEING_CHAIN="postrouting_miniupnpd"
PREROUTING_CHAIN="prerouting_miniupnpd"
POSTROUTING_CHAIN="postrouting_miniupnpd"
while getopts ":t:n:c:p:r:" opt; do
case $opt in
@ -23,10 +23,10 @@ while getopts ":t:n:c:p:r:" opt; do
CHAIN=$OPTARG
;;
p)
PREROUTEING_CHAIN=$OPTARG
PREROUTING_CHAIN=$OPTARG
;;
r)
POSTROUTEING_CHAIN=$OPTARG
POSTROUTING_CHAIN=$OPTARG
;;
\?)
echo "Invalid option: -$OPTARG" >&2

4
miniupnpd/netfilter_nft/scripts/nft_delete_chain.sh
View File

@ -3,8 +3,8 @@
. $(dirname "$0")/miniupnpd_functions.sh
# Prerouting
$NFT delete chain inet $NAT_TABLE $PREROUTEING_CHAIN
$NFT delete chain inet $NAT_TABLE $PREROUTING_CHAIN
# Postrouting
$NFT delete chain inet $NAT_TABLE $POSTROUTEING_CHAIN
$NFT delete chain inet $NAT_TABLE $POSTROUTING_CHAIN
# Filter
$NFT delete chain inet $TABLE $CHAIN

4
miniupnpd/netfilter_nft/scripts/nft_display.sh
View File

@ -3,8 +3,8 @@
. $(dirname "$0")/miniupnpd_functions.sh
# Prerouting
$NFT list chain inet $NAT_TABLE $PREROUTEING_CHAIN
$NFT list chain inet $NAT_TABLE $PREROUTING_CHAIN
# Postrouting
$NFT list chain inet $NAT_TABLE $POSTROUTEING_CHAIN
$NFT list chain inet $NAT_TABLE $POSTROUTING_CHAIN
# Filter
$NFT list chain inet $TABLE $CHAIN

4
miniupnpd/netfilter_nft/scripts/nft_flush.sh
View File

@ -3,5 +3,5 @@
. $(dirname "$0")/miniupnpd_functions.sh
$NFT flush chain inet $TABLE $CHAIN
$NFT flush chain inet $NAT_TABLE $PREROUTEING_CHAIN
$NFT flush chain inet $NAT_TABLE $POSTROUTEING_CHAIN
$NFT flush chain inet $NAT_TABLE $PREROUTING_CHAIN
$NFT flush chain inet $NAT_TABLE $POSTROUTING_CHAIN

8
miniupnpd/netfilter_nft/scripts/nft_init.sh
View File

@ -49,7 +49,7 @@ cat >> /tmp/miniupnpd.nft <<EOF
policy accept;
# miniupnpd
jump $PREROUTEING_CHAIN
jump $PREROUTING_CHAIN
# Add other rules here
}
@ -59,15 +59,15 @@ cat >> /tmp/miniupnpd.nft <<EOF
policy accept;
# miniupnpd
jump $POSTROUTEING_CHAIN
jump $POSTROUTING_CHAIN
# Add other rules here
}
chain $PREROUTEING_CHAIN {
chain $PREROUTING_CHAIN {
}
chain $POSTROUTEING_CHAIN {
chain $POSTROUTING_CHAIN {
}
}
EOF

2
miniupnpd/netfilter_nft/scripts/nft_removeall.sh
View File

@ -17,7 +17,7 @@ fi
if [ "$TABLE" != "$NAT_TABLE" ]
then
$NFT --check list table inet $TABLE > /dev/null 2>&1
$NFT --check list table inet $NAT_TABLE > /dev/null 2>&1
if [ $? -eq "0" ]; then
# then remove the table itself
echo "Remove miniupnpd nat table"

2
miniupnpd/options.c
View File

@ -69,7 +69,7 @@ static const struct {
{ UPNPCLEANINTERVAL, "clean_ruleset_interval"},
#ifdef USE_NETFILTER
{ UPNPTABLENAME, "upnp_table_name"},
{ UPNPNATTABLENAME, "upnp_nattable_name"},
{ UPNPNATTABLENAME, "upnp_nat_table_name"},
{ UPNPFORWARDCHAIN, "upnp_forward_chain"},
{ UPNPNATCHAIN, "upnp_nat_chain"},
{ UPNPNATPOSTCHAIN, "upnp_nat_postrouting_chain"},