From 72d6dc20d0fc942dd05a3f4b5d16438fe6a97703 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 5 Feb 2012 15:22:32 +0000 Subject: [PATCH] [packages_10.03.2] linuxigd: merge r29070 git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30214 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/linuxigd/Makefile | 4 ++-- net/linuxigd/files/upnpd.init | 30 +++++++++++++----------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile index 6fc5c15..e8b2b32 100644 --- 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 e250305..832768f 100644 --- 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 } -- 2.11.0