miniupnpd: bump to latest, fix enabled-check in hotplug script

[feed/routing.git] / miniupnpd / files / miniupnpd.hotplug

diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index 7ff363a4ff8360a85e4d9261599f660886feffe3..65bc5006d1d518d8c8575b158474a9d36dbd9ee6 100644 (file)
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -1,28 +1,41 @@
 #!/bin/sh
 
-if [ ! /etc/init.d/miniupnpd enabled ]
-then
-    exit 0
-fi
+/etc/init.d/miniupnpd enabled || exit 0
 
 . /lib/functions/service.sh
 
 # If miniupnpd is not running:
 # - check on _any_ event (even updates may contribute to network_find_wan*)
+
 # If miniupnpd _is_ running:
-# - check only on ifup
+# - check only on ifup (otherwise lease updates etc would cause
+#   miniupnpd state loss)
 
 [ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0
 
 local iface
-local ext_iface
-local ext_iface6
+local ifname
+local tmpconf="/var/etc/miniupnpd.conf"
+local extiface=$(uci get upnpd.config.external_iface)
+local extzone=$(uci get upnpd.config.external_zone)
 
 . /lib/functions/network.sh
-network_find_wan ext_iface
-network_find_wan6 ext_iface6
 
-for iface in $ext_iface $ext_iface6 $(uci_get upnpd config internal_iface; uci_get upnpd config external_iface); do
-    [ "$INTERFACE" = "$iface" ] && /etc/init.d/miniupnpd restart
-    exit 0
+for iface in $(uci get upnpd.config.internal_iface); do
+    network_get_device device $iface
+    [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
 done
+
+
+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}
+grep -q "ext_ifname=$ifname" $tmpconf || /etc/init.d/miniupnpd restart