minimalist-pcproxy/miniupnpd: added+using upnp.config.external_zone.

diff --git a/minimalist-pcproxy/files/minimalist-pcproxy.defaults b/minimalist-pcproxy/files/minimalist-pcproxy.defaults
index 4e041e5dd6ae19a74be00dd7f04752674fd5d09d..a29d7b3de0d1e32c62781862aebc3ddc8b0796c4 100644 (file)
--- a/minimalist-pcproxy/files/minimalist-pcproxy.defaults
+++ b/minimalist-pcproxy/files/minimalist-pcproxy.defaults
@@ -10,6 +10,7 @@ set upnpd.config.enable_upnp=0
 set upnpd.config.pcp_allow_thirdparty=1
 set upnpd.config.internal_iface=loopback
 set upnpd.config.ipv6_listening_ip=::1
+set upnpd.config.external_zone=wan
 set upnpd.config._pcproxy_configured=1
 commit upnpd
 EOF

diff --git a/miniupnpd/files/firewall.include b/miniupnpd/files/firewall.include
index 9a42e0613f4ce11a11bca468fc5247af306c463f..818af9dbc4446c3d4ae2ec69dcb74b8dbdb0c184 100644 (file)
--- a/miniupnpd/files/firewall.include
+++ b/miniupnpd/files/firewall.include
@@ -34,11 +34,17 @@ for ext_iface in $(uci -q get upnpd.config.external_iface); do
     add_extzone_rules $(fw3 -q network "$ext_iface")
 done
 
+add_extzone_rules $(uci -q get upnpd.config.external_zone)
+
 [ ! $ADDED = 0 ] && exit 0
 
-# If it's not available, resort to network_find_wan{,6} and
+
+# If really nothing is available, resort to network_find_wan{,6} and
 # assume external interfaces all have same firewall zone.
 
+# (This heuristic may fail horribly, in case of e.g. multihoming, so
+# please set external_zone in that case!)
+
 network_find_wan wan_iface
 network_find_wan6 wan6_iface
 

diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index c3805381767cb3deb563028b23a5167053ae7ccb..09a4913926a76e7b7816339644981e2f5929e346 100644 (file)
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -31,3 +31,7 @@ for iface in $ext_iface $ext_iface6 $(uci_get upnpd config internal_iface; uci_g
     network_get_device device $iface
     [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
 done
+
+for device in $(fw3 -q zone `uci_get upnpd config external_zone`); do
+    [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
+done

diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index a10924401c1b5f1c50b6f2e7f6f222e0651f6866..68ec2118c06e6d5304eb5017a96e5197aabd2c9c 100644 (file)
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -70,6 +70,7 @@ start() {
         local ipv6_listening_ip
 
        config_get extiface config external_iface
+       config_get extzone config external_zone
        config_get intiface config internal_iface
        config_get extip config external_ip
        config_get port config port 5000
@@ -93,10 +94,18 @@ start() {
 
        local ifname
 
-        [ -n "$extiface" ] || network_find_wan extiface
-        [ -n "$extiface" ] || network_find_wan6 extiface
-
-       network_get_device ifname ${extiface}
+        # manual external interface overrides everything
+        if [ -z "$extiface" ] ; then
+            # manual external zone (if dynamically find interfaces
+            # belonging to it) overrides network_find_wan*
+            if [ -n "$extzone" ] ; then
+                ifname=$(fw3 -q zone $extzone | head -1)
+            fi
+            [ -n "$extiface" ] || network_find_wan extiface
+            [ -n "$extiface" ] || network_find_wan6 extiface
+        fi
+
+       [ -n "$ifname"] || network_get_device ifname ${extiface}
 
        if [ -n "$conffile" ]; then
                args="-f $conffile"