From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 25 Jan 2009 14:59:25 +0000 (+0000)
Subject: packages/net/miniupnpd: implement option for "secure" mode and enable it by default
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=2ba32034040d2f140e6238a045856fe1a5306418

packages/net/miniupnpd: implement option for "secure" mode and enable it by default


SVN-Revision: 14175
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index feba7cfad4..91b006b271 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MD5SUM:=a0f6651476721db9b554668c8c83b151
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index 5e337df5fd..f2cc7391b3 100644
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -16,6 +16,7 @@ start() {
 	local upload
 	local download
 	local logging
+	local secure
 
 	config_load "upnpd"
 	config_get extif    config external_iface
@@ -23,6 +24,7 @@ start() {
 	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_load "network"
 	config_get extiface ${extif:-wan} ifname
@@ -43,6 +45,9 @@ start() {
 		[ -n "$upload" -a -n "$download" ] && \
 			append args "-B $(($download * 1024 * 8)) $(($upload * 1024 * 8))"
 
+		[ "$secure" -gt 0 ] && \
+			append args "-S"
+
 		if [ "$logging" = "1" ]; then
 			eval start-stop-daemon -S -x miniupnpd -- $args -d | logger -t miniupnpd &
 		else
diff --git a/net/miniupnpd/files/upnpd.config b/net/miniupnpd/files/upnpd.config
index 2aee8224a6..e4284839c6 100644
--- a/net/miniupnpd/files/upnpd.config
+++ b/net/miniupnpd/files/upnpd.config
@@ -1,4 +1,5 @@
 config upnpd config
+	option secure_mode	1
 	option log_output	0
 	option download 	1024
 	option upload   	512