From: Markus Stenberg Date: Wed, 22 Feb 2017 07:59:36 +0000 (+0200) Subject: Merge pull request #276 from kdarbyshirebryant/upnpenabled X-Git-Url: http://git.ozo.com/?p=lede-routing%2F.git;a=commitdiff_plain;h=209a58d40f765832eb6dfe489daeb232041eb11d;hp=4ef6404bcb1e39908bb8e365a83dd01913c3a9d7 Merge pull request #276 from kdarbyshirebryant/upnpenabled miniupnpd: implement an 'enabled' flag --- diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init index c7dc6a2..c934a28 100644 --- a/miniupnpd/files/miniupnpd.init +++ b/miniupnpd/files/miniupnpd.init @@ -68,7 +68,11 @@ start() { local extip port usesysuptime conffile serial_number model_number local uuid notify_interval presentation_url enable_upnp local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval - local ipv6_listening_ip + local ipv6_listening_ip enabled + + config_get_bool enabled config enabled 1 + + [ "$enabled" -gt 0 ] || return 1 config_get extiface config external_iface config_get extzone config external_zone diff --git a/miniupnpd/files/upnpd.config b/miniupnpd/files/upnpd.config index 56cde57..9a65bfa 100644 --- a/miniupnpd/files/upnpd.config +++ b/miniupnpd/files/upnpd.config @@ -1,4 +1,5 @@ config upnpd config + option enabled 0 option enable_natpmp 1 option enable_upnp 1 option secure_mode 1