linuxigd: merge r29070

SVN-Revision: 30214

diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 6fc5c153b0cc3a6ef403a6bcbe2e40be152ca9d9..e8b2b32a5932daf732c4576019d9df297efb9c7f 100644 (file)
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 # Copyright (C) 2006 loswillios
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linuxigd
 PKG_VERSION:=1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-igd

diff --git a/net/linuxigd/files/upnpd.init b/net/linuxigd/files/upnpd.init
index e250305f8242d9cabc10907ef7f09fd3b5e410fa..832768f636c458629878176c51d908f0530dadc8 100644 (file)
--- a/net/linuxigd/files/upnpd.init
+++ b/net/linuxigd/files/upnpd.init
@@ -1,29 +1,25 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 # Copyright (C) 2006 loswillios
+
 START=65
 
 include /lib/network
-scan_interfaces
-config_get WAN wan ifname
-config_get LAN lan ifname
 
 start() {
-    echo -n "Starting UPnP: "
-    route add -net 239.0.0.0 netmask 255.0.0.0 $LAN
-    upnpd $WAN $LAN
-    echo "OK"
+       scan_interfaces
+       config_get wan_if 'wan' 'ifname'
+       config_get lan_if 'lan' 'ifname'
+       [ -n "$wan_if" ] || return 1
+
+       [ -n "$lan_if" ] && route add -net 239.0.0.0 netmask 255.0.0.0 $lan_if
+       service_start /usr/sbin/upnpd $wan_if $lan_if
 }
 
 stop() {
-    echo -n "Stopping UPnP: "
-    route del -net 239.0.0.0 netmask 255.0.0.0 $LAN
-    killall upnpd
-    echo "OK"
-}
+       scan_interfaces
+       config_get lan_if 'lan' 'ifname'
 
-restart() {
-        stop
-        sleep 5
-        start
+       service_stop /usr/sbin/upnpd
+       [ -n "$lan_if" ] && route del -net 239.0.0.0 netmask 255.0.0.0 $lan_if
 }