packages/net/miniupnpd:

[openwrt/svn-archive/archive.git] / net / miniupnpd / files / miniupnpd.firewall

diff --git a/net/miniupnpd/files/miniupnpd.firewall b/net/miniupnpd/files/miniupnpd.firewall
index df1f6f7843d43597f892f2089e633a2b82c7c27e..4761a6352c03b1c9a10889af0269a316892e36aa 100644 (file)
--- a/net/miniupnpd/files/miniupnpd.firewall
+++ b/net/miniupnpd/files/miniupnpd.firewall
@@ -7,69 +7,57 @@ upnp_ipt() {
 }
 
 upnp_firewall_addif() {
-       local intif
-       local intip
-       local coldplug="$1"
+       local extif
+       local extip
+       local iface
 
        config_load upnpd
-       config_get intif config internal_iface
+       config_get iface config external_iface
+
+       [ -n "$INTERFACE" -a "$INTERFACE" != "$iface" ] && return
 
        config_load network
+       config_get extip "${iface:-wan}" ipaddr
+       config_get extif "${iface:-wan}" ifname
+
+       logger -t "upnp firewall" "adding wan interface $extif($extip)"
+
+       upnp_ipt -t nat -N miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t nat -A miniupnpd_${iface:-wan}_rule -i $extif -d $extip -j MINIUPNPD
+       upnp_ipt -t nat -A prerouting_rule -j miniupnpd_${iface:-wan}_rule
 
-       for iface in ${intif:-lan}; do
-               if [ -n "$coldplug" -o "$iface" == "$INTERFACE" ]; then
-                       config_get intip "$iface" ipaddr
-                       config_get intif "$iface" ifname
-
-                       [ -n "$intif" -a -n "$intip" ] && {
-                               logger -t "upnp firewall" "adding interface $iface($intip)"
-
-                               upnp_ipt -t nat -N MINIUPNPD
-                               upnp_ipt -t nat -N miniupnpd_${iface}_rule
-                               upnp_ipt -t nat -A miniupnpd_${iface}_rule -i $intif -d $intip -j MINIUPNPD 
-                               upnp_ipt -t nat -A prerouting_rule -j miniupnpd_${iface}_rule
-
-                               upnp_ipt -t filter -N MINIUPNPD
-                               upnp_ipt -t filter -N miniupnpd_${iface}_rule
-                               upnp_ipt -t filter -A miniupnpd_${iface}_rule -i $intif -o ! $intif -j MINIUPNPD
-                               upnp_ipt -t filter -A forwarding_rule -j miniupnpd_${iface}_rule
-                       }
-               fi
-       done
+       upnp_ipt -t filter -N miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t filter -A miniupnpd_${iface:-wan}_rule -i $extif -o ! $extif -j MINIUPNPD
+       upnp_ipt -t filter -A forwarding_rule -j miniupnpd_${iface:-wan}_rule
 }
 
 upnp_firewall_delif() {
-       local iface="${1:-$INTERFACE}"
+       local iface
+
+       config_load upnpd
+       config_get iface config external_iface
 
-       if [ -n "$iface" ]; then
-               logger -t "upnp firewall" "removing interface $iface"
+       [ -n "$INTERFACE" -a "$INTERFACE" != "$iface" ] && return
 
-               upnp_ipt -t nat -D prerouting_rule -j miniupnpd_${iface}_rule
-               upnp_ipt -t nat -F miniupnpd_${iface}_rule
-               upnp_ipt -t nat -X miniupnpd_${iface}_rule
+       logger -t "upnp firewall" "removing wan interface"
 
-               upnp_ipt -t filter -D forwarding_rule -j miniupnpd_${iface}_rule
-               upnp_ipt -t filter -F miniupnpd_${iface}_rule
-               upnp_ipt -t filter -X miniupnpd_${iface}_rule
-       fi
+       upnp_ipt -t nat -D prerouting_rule -j miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t nat -F miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t nat -X miniupnpd_${iface:-wan}_rule
+
+       upnp_ipt -t filter -D forwarding_rule -j miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t filter -F miniupnpd_${iface:-wan}_rule
+       upnp_ipt -t filter -X miniupnpd_${iface:-wan}_rule
 }
 
 upnp_firewall_start() {
-       logger -t "upnp firewall" "starting ..."
-       upnp_firewall_addif coldplug
+       upnp_ipt -t nat -N MINIUPNPD
+       upnp_ipt -t filter -N MINIUPNPD
+       upnp_firewall_addif
 }
 
 upnp_firewall_stop() {
-       local intif
-       config_load upnpd
-       config_get intif config internal_iface
-
-       logger -t "upnp firewall" "stopping ..."
-
-       for iface in ${intif:-lan}; do
-               upnp_firewall_delif "$iface"
-       done
-
+       upnp_firewall_delif
        upnp_ipt -t nat -F MINIUPNPD
        upnp_ipt -t nat -X MINIUPNPD
        upnp_ipt -t filter -F MINIUPNPD