[packages] miniupnpd: Added uci option use_system_uptime which defaults to true to...

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

diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index 6a2c0d15c4565ab0272c8d93d17a12f7579b9bfd..3576af0285fb2f45d9979090b74098d7d7456abb 100644 (file)
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -1,26 +1,88 @@
-#!/bin/sh
-upnpd_enabled=$(nvram get upnp_enabled)
-if [ "$upnpd_enabled" = "1" ]; then
-       echo "miniupnpd starting ..."
-       iptables_flush.sh 2>&- >&-
-       killall miniupnpd 2>&-
-       iptables_removeall.sh 2>&- >&-
-       iptables_init.sh
-       # get bitspeed information, if provided
-       upnpd_up_bitspeed=$(nvram get upnpd_up_bitspeed)
-       upnpd_down_bitspeed=$(nvram get upnpd_down_bitspeed)
-       [ -n "$upnpd_up_bitspeed" ] && [ -n "$upnpd_down_bitspeed" ] && {
-               # covert to bytespeed
-               let upnpd_up_bytespeed=$upnpd_up_bitspeed*1024/8
-               let upnpd_down_bytespeed=$upnpd_down_bitspeed*1024/8
-               bitspeed_str="-B $upnpd_down_bytespeed $upnpd_up_bytespeed"
-       }
-       upnpd_log=$(nvram get upnpd_log_output)
-       if [ "$upnpd_log" = "1" ]; then
-               miniupnpd -i $(nvram get wan_ifname) -a $(nvram get lan_ipaddr) -p 5000 -U "$bitspeed_str" -d | logger -t miniupnpd &
+#!/bin/sh /etc/rc.common
+START=95
+
+start() {
+       type miniupnpd_add_rules >/dev/null 2>/dev/null || \
+               ACTION=- . /etc/hotplug.d/firewall/50-miniupnpd
+
+       config_load "upnpd"
+       local extiface intiface upload download logging secure enabled natpmp
+       local extip port usesystuptime
+
+       config_get extiface config external_iface
+       config_get intiface config internal_iface
+       config_get extip config external_ip
+       config_get port config port 5000
+       config_get upload   config upload
+       config_get download config download
+       config_get_bool logging config log_output 0
+       config_get_bool secure config secure_mode 0
+       config_get_bool natpmp config enable_natpmp 0
+       config_get_bool enabled config enabled 0 
+       config_get_bool usesysuptime config use_system_uptime 1
+
+       include /lib/network
+       scan_interfaces
+
+       local ifname
+       config_get ifname ${extiface:-wan} ifname
+
+       if [ -n "$ifname" ]; then
+               local args="-i $ifname"
+               local iface
+
+               [ -n "$extip" ] && \
+                       append args "-o $extip"
+               
+               for iface in ${intiface:-lan}; do
+                       local ipaddr
+                       config_get ipaddr "$iface" ipaddr
+                       [ -n "$ipaddr" ] && append args "-a $ipaddr"
+               done
+
+               [ "$port" != "auto" ] && \
+                       append args "-p $port"
+               
+               [ "$usesysuptime" -eq 1 ] && \
+                       append args "-U"
+
+               [ -n "$upload" -a -n "$download" ] && \
+                       append args "-B $(($download * 1024 * 8)) $(($upload * 1024 * 8))"
+
+               [ "$secure" -gt 0 ] && \
+                       append args "-S"
+
+               [ "$natpmp" -gt 0 ] && \
+                       append args "-N"
+
+               # start firewall
+               local zone
+               config_load firewall
+               config_get zone core "${extiface:-wan}_zone"
+               [ -n "$zone" ] && \
+                       miniupnpd_add_rules "$zone" "${extiface:-wan}" "$ifname"
+
+               if [ "$logging" = "1" ]; then
+                       [ "$enabled" -gt 0 ] && eval start-stop-daemon -S -x miniupnpd -- $args -d | logger -t miniupnpd &
+               else
+                       [ "$enabled" -gt 0 ] && eval start-stop-daemon -S -x miniupnpd -- $args 2>/dev/null
+               fi
        else
-               miniupnpd -i $(nvram get wan_ifname) -a $(nvram get lan_ipaddr) -p 5000 -U "$bitspeed_str"
+               logger -t "upnp daemon" "external interface not found, not starting"
        fi
-else
-       echo "miniupnpd service is disabled. Set nvram upnp_enabled to '1' to enable."
-fi
+}
+
+stop() {
+       start-stop-daemon -K -q -x miniupnpd -p /var/run/miniupnpd.pid
+       rm -f /var/run/miniupnpd.pid
+
+       type miniupnpd_remove_rules >/dev/null 2>/dev/null || \
+               ACTION=- . /etc/hotplug.d/firewall/50-miniupnpd
+
+       miniupnpd_remove_rules
+
+       iptables -t nat -F MINIUPNPD 2>/dev/null
+       iptables -t nat -X MINIUPNPD 2>/dev/null
+       iptables -t filter -F MINIUPNPD 2>/dev/null
+       iptables -t filter -X MINIUPNPD 2>/dev/null
+}