Skip to content

Commit

Permalink
Revert "net/miniupnpd: ext_ip_reserved_ignore support"
Browse files Browse the repository at this point in the history
This patch is causing several issues [1], which then were reported to
upstream [2] and it was not accepted by upstream [3]. This results that
nobody maintain this custom patch and it is not useful as it is changing
addr_is_reserved behavior.

[1] #15258
[2] miniupnp/miniupnp#542
[3] miniupnp/miniupnp#511

This reverts commit b76aa99.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
  • Loading branch information
BKPepe committed Jul 19, 2021
1 parent 7ed7e70 commit 107f337
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 114 deletions.
2 changes: 1 addition & 1 deletion net/miniupnpd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=miniupnpd
PKG_VERSION:=2.2.2
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
Expand Down
3 changes: 0 additions & 3 deletions net/miniupnpd/files/miniupnpd.init
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ upnpd() {
local use_stun stun_host stun_port uuid notify_interval presentation_url
local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval
local ipv6_disable
local ext_ip_reserved_ignore

local enabled
config_get_bool enabled config enabled 1
Expand Down Expand Up @@ -90,7 +89,6 @@ upnpd() {
config_get clean_ruleset_threshold config clean_ruleset_threshold
config_get clean_ruleset_interval config clean_ruleset_interval
config_get ipv6_disable config ipv6_disable 0
config_get ext_ip_reserved_ignore config ext_ip_reserved_ignore 0

local conf ifname ifname6

Expand Down Expand Up @@ -143,7 +141,6 @@ upnpd() {
upnpd_write_bool igdv1 0 force_igd_desc_v1
upnpd_write_bool use_stun 0 ext_perform_stun
upnpd_write_bool ipv6_disable $ipv6_disable
upnpd_write_bool ext_ip_reserved_ignore $ext_ip_reserved_ignore

[ "$use_stun" -eq 0 ] || {
[ -n "$stun_host" ] && echo "ext_stun_host=$stun_host"
Expand Down
110 changes: 0 additions & 110 deletions net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch

This file was deleted.

0 comments on commit 107f337

Please sign in to comment.