Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

miniupnpd: avoid unnecessary restarts, add SPDX tag

Browse source
This commit is contained in:
Steven Barth 2014-10-15 23:05:34 +02:00
parent 93f7d5cacb
commit 8bc38fccc7
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
miniupnpd/Makefile
View file

@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=1.8.20140906 PKG_VERSION:=1.8.20140906
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE_URL:=http://miniupnp.free.fr/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2 PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2
PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi> PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
PKG_LICENSE:=BSD-3-Clause
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

29
miniupnpd/files/miniupnpd.hotplug
View file

@ -16,22 +16,29 @@ fi
[ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0 [ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0
# DEVICE is set only in ifup as of 20140625 netifd
[ -z "$DEVICE" ] && network_get_device DEVICE $INTERFACE
local iface local iface
local ext_iface local ifname
local ext_iface6 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 . /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 for iface in $(uci get upnpd.config.internal_iface); do
network_get_device device $iface network_get_device device $iface
[ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0 [ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0
done done
for device in $(fw3 -q zone `uci_get upnpd config external_zone`); do
[ "$DEVICE" = "$device" ] && /etc/init.d/miniupnpd restart && exit 0 if [ -z "$extiface" ] ; then
done # 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