diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-02-04 19:16:44 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-02-04 22:51:45 +0200 |
| commit | 7f5534ac7a88124c59b23188bcdc39bd9e92d879 (patch) | |
| tree | ac21de6904241981de090ea4953bdf2100f62b39 /net/miniupnpd/Makefile | |
| parent | 7ec5a355d735a3ca0d5c66f9179429dc4ba87492 (diff) | |
miniupnpd: introduce IGDv1 variant
Microsoft Windows, Xbox and possibly other operating systems do not
support IGDv2. With IGDv2 enabled, they send a HTTP GET request for
rootDesc.xml and WANIPCn.xml, and then nothing happens. The Microsoft
implementation probably doesn't like the WANIPCn.xml response and
decides UPnP is not available. When miniupnpd is built without IGDv2
support, after the 2 HTTP GET requests, there is a HTTP POST request to
/ctl/IPConn, and miniupnpd configures the port forward as expected.
The runtime option force_igd_desc_v1=yes (UCI: igvd1) does not solve
this problem. It's possible this was enough in earlier miniupnpd
versions, but it does not fix the problem the current version.
Since we are a modern distro, we want to support the latest and
greatest, so we should default to IGDv2 enabled. Introducing a
menuconfig option to disable IGDv2 would only help people who build
their own images, so offer a separate package variant for IGDv1.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'net/miniupnpd/Makefile')
| -rw-r--r-- | net/miniupnpd/Makefile | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 64e7667a4..0b7d7e1ca 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -26,7 +26,7 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/version.mk -define Package/miniupnpd +define Package/miniupnpd/Default SECTION:=net CATEGORY:=Network DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libuuid +libcap-ng @@ -35,10 +35,26 @@ define Package/miniupnpd URL:=https://miniupnp.tuxfamily.org/ endef +define Package/miniupnpd + $(call Package/miniupnpd/Default) + TITLE+= (IGDv2) + CONFLICTS:=miniupnpd-igdv1 + VARIANT:=igdv2 +endef + +define Package/miniupnpd-igdv1 + $(call Package/miniupnpd/Default) + TITLE+= (IGDv1) + PROVIDES:=miniupnpd + VARIANT:=igdv1 +endef + define Package/miniupnpd/conffiles /etc/config/upnpd endef +Package/miniupnpd-igdv1/conffiles = $(Package/miniupnpd/conffiles) + define Build/Prepare $(call Build/Prepare/Default) echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt @@ -46,12 +62,15 @@ endef CONFIGURE_ARGS = \ $(if $(CONFIG_IPV6),--ipv6) \ - --igd2 \ --leasefile \ --portinuse \ --firewall=iptables \ --disable-fork +ifeq ($(BUILD_VARIANT),igdv2) + CONFIGURE_ARGS += --igd2 +endif + TARGET_CFLAGS += $(FPIC) -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed @@ -71,4 +90,7 @@ define Package/miniupnpd/install $(INSTALL_DATA) ./files/firewall.include $(1)/usr/share/miniupnpd/firewall.include endef +Package/miniupnpd-igdv1/install = $(Package/miniupnpd/install) + $(eval $(call BuildPackage,miniupnpd)) +$(eval $(call BuildPackage,miniupnpd-igdv1)) |