[Astlinux-commits] SF.net SVN: astlinux:[7751] branches/1.0/package/arnofw

[<abe...@us...>]

Revision: 7751
          http://sourceforge.net/p/astlinux/code/7751
Author:   abelbeck
Date:     2016-07-12 15:57:50 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
arnofw, add support for new NAT_IF variable in AIF, tracks EXT_IF interfaces that are NAT'ed

Modified Paths:
--------------
    branches/1.0/package/arnofw/arnofw.wrapper
    branches/1.0/package/arnofw/miniupnpd/50miniupnpd.plugin.sh

Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper	2016-07-11 13:55:09 UTC (rev 7750)
+++ branches/1.0/package/arnofw/arnofw.wrapper	2016-07-12 15:57:50 UTC (rev 7751)
@@ -160,17 +160,22 @@
 
   if [ -z "$PPPOEIF" ]; then
     EXT_IF=""
+    NAT_IF=""
     unset IFS
     for intf in $EXTIF $EXT2IF; do
       EXT_IF="$EXT_IF${EXT_IF:+ }$intf"
+      NAT_IF="$NAT_IF${NAT_IF:+ }$intf"
     done
   else
     EXT_IF="${PPPOE_EXTIF:-ppp+}"
+    NAT_IF="${PPPOE_EXTIF:-ppp+}"
     unset IFS
     for intf in $EXTIF $EXT2IF; do
       case "$intf" in
         ppp[0-9]*) ;;
-        *) EXT_IF="$EXT_IF $intf" ;;
+        *) EXT_IF="$EXT_IF $intf"
+           NAT_IF="$NAT_IF $intf"
+           ;;
       esac
     done
   fi

Modified: branches/1.0/package/arnofw/miniupnpd/50miniupnpd.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/miniupnpd/50miniupnpd.plugin.sh	2016-07-11 13:55:09 UTC (rev 7750)
+++ branches/1.0/package/arnofw/miniupnpd/50miniupnpd.plugin.sh	2016-07-12 15:57:50 UTC (rev 7751)
@@ -2,14 +2,14 @@
 #            -= Arno's iptables firewall - MiniUPnPd plugin =-
 #
 PLUGIN_NAME="MiniUPnPd plugin"
-PLUGIN_VERSION="1.0"
+PLUGIN_VERSION="1.01"
 PLUGIN_CONF_FILE="miniupnpd.conf"
 #
-# Last changed          : July 6, 2012
+# Last changed          : July 12, 2016
 # Requirements          : AIF 2.0.0+ with miniupnpd daemon
 # Comments              : Setup of the iptables chains that the miniupnpd daemon manages
 #
-# Author                : (C) Copyright 2012 by Lonnie Abelbeck & Arno van Amersfoort
+# Author                : (C) Copyright 2012-2016 by Lonnie Abelbeck & Arno van Amersfoort
 # Homepage              : http://rocky.eld.leidenuniv.nl/
 # Freshmeat homepage    : http://freshmeat.net/projects/iptables-firewall/?topic_id=151
 # Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
@@ -67,7 +67,7 @@
   # Reconnect both MINIUPNPD chains, flushed on a restart
 
   IFS=' ,'
-  for eif in $EXT_IF; do
+  for eif in ${NAT_IF:-$EXT_IF}; do
     ip4tables -t nat -A POST_NAT_PREROUTING_CHAIN -i $eif -j MINIUPNPD
 
     ip4tables -A POST_FORWARD_CHAIN -i $eif ! -o $eif -j MINIUPNPD
@@ -89,7 +89,7 @@
   fi
 
   IFS=' ,'
-  for eif in $EXT_IF; do
+  for eif in ${NAT_IF:-$EXT_IF}; do
     ip4tables -t nat -D POST_NAT_PREROUTING_CHAIN -i $eif -j MINIUPNPD
 
     ip4tables -D POST_FORWARD_CHAIN -i $eif ! -o $eif -j MINIUPNPD

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.