Commit Graph

18 Commits

Author SHA1 Message Date
Tiago Gaspar 651a578cac miniupnpd: update and fix nftables variant
Update the package to a commit that fixes an issue with removing PCP
mappings from nftables.
This also allows us to fix the nftables miniupnpd implementation on
openwrt.
In this new implementation, a table is created at the start of miniupnpd
and it is dedicated to miniupnpd with a priority above the firewall4
table. This allows miniupnpd to go ahead of the drop rules of firewall4
and forward traffic as needed. There was the possibility of adding a
chain inside the firewall4 table, but this would raise an issue where
if firewall4 was reloaded the port forwardings would be lost and
miniupnpd could be out of sync. When miniupnpd is stopped the table is
deleted, taking the port forwardings with it.

Some of this commit is based of msylgj's work, mainly the logic of the
init/hotplug scripts and the makefile build parameters.

Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-08-25 00:40:19 -07:00
Josef Schlehofer 0bc25077b3
Revert "miniupnpd: bump to latest git source"
This was reverted because the commit does more things than just "bump to
latest git source". Also, it was not properly reviewed/tested.

See: https://github.com/openwrt/packages/pull/18133#issuecomment-1106346788

This reverts commit b3b911e992.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-04-22 17:20:39 +02:00
ZiMing Mo b3b911e992 miniupnpd: bump to latest git source
Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
2022-04-14 19:01:03 -07:00
Stijn Tintel 7fbc5d4db3 miniupnpd: create iptables and nftables variant
The next OpenWrt stable release aims to use firewall4 by default. As
this uses nftables as backend, miniupnpd will no longer work. Create an
iptables and nftables variant of the miniupnpd package so that miniupnpd
can be used with either firewall variant.

See #16818 for more info.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-01-05 11:00:02 +02:00
Shaleen Jain c2e846dae6 miniupnpd: update to version 2.2.3
Signed-off-by: Shaleen Jain <shaleen@jain.sh>
2022-01-05 08:18:38 +01:00
Josef Schlehofer 107f3376b5
Revert "net/miniupnpd: ext_ip_reserved_ignore support"
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] https://github.com/openwrt/packages/issues/15258
[2] https://github.com/miniupnp/miniupnp/issues/542
[3] https://github.com/miniupnp/miniupnp/pull/511

This reverts commit b76aa99194.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2021-07-19 14:03:37 +02:00
Stan Grishin dc881068b9 miniupnpd: disable ext_ip_reserved_ignore by default; fix grammar
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-06-02 04:54:16 +00:00
Stijn Tintel b8f9e4354e miniupnpd: bump to 2.2.2
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2021-05-21 18:20:37 +01:00
Ilya Lipnitskiy 5d8d4fbbcb
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
2021-02-20 16:02:15 -08:00
Chen Minqiang b76aa99194 net/miniupnpd: ext_ip_reserved_ignore support
This add an option to ignore ext_ip reserved
Enable this option in config by default.

Fixes: #13773

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2020-11-26 15:56:20 +08:00
Rosen Penev 4d824243e6
miniupnpd: update to 2.2.0
Replace daemon patch with upstream solution.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-11-25 14:10:41 -08:00
Kevin Darbyshire-Bryant 0189c45253 miniupnpd: macosx compat and refresh patches
Tidy up some minor patch fuzz with a refresh.

Also tweak the linux makefile to make it run on macosx and linux:
install only understand -m for filemode, not that the openwrt staging
dir understands file modes.  Also glibc>2.17 so patch out the check that
otherwise barfs a number of errors from a missing 'ldd' command under
macos.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-07-01 10:16:43 +01:00
Rosen Penev c61614a849
miniupnpd: convert to procd
Massive cleanup of the shell script. Many issues were fixed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-13 15:34:25 -08:00
DENG Qingfang fcf72ceec4 miniupnpd: update to 2.1.20191006
Removed upstreamed patch:
100-build-on-OpenWrt.patch

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
2019-10-12 14:54:26 +08:00
Rosen Penev ee4a1c0c09
miniupnpd: Fix compilation under glibc
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-27 12:01:45 -07:00
Rosen Penev 96f50729ad
miniupnpd: Update to 2.1.20190408
Refreshed patch.

Added PKG_LICENSE_FILES.

Added --as-needed linker flag for slightly smaller size.

Removed -O2 hack to get it to compile. As part of this, removed a bunch of
CFLAGS that are normally passed which potentially affect compilation with
Os.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-13 17:04:23 -07:00
Rosen Penev 8dc7472705 miniupnpd: Update to 2.1.20180706
Switched to upstream mirror 2, which is reachable over HTTPS.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-08-04 11:55:33 -07:00
Kevin Darbyshire-Bryant a2e2eeb409 miniupnpd: Import release 20180422 to repo
Import miniupnpd from routing repo and bump to 20180422.

Drop 102-ipv6-ext-port.patch as this looks upstreamed in the pinhole
code to me.
Consolidate all other patches & update with a view to sending upstream.

Add support for runtime IGDv1 mode switch (default to IGDv2)

(not extensively) Tested-on: ar71xx Archer C7 v2 in IGDv1 compatibility
mode.  A variety of devices/applications appear to be able to create
mappings.

Have an attempt at resolving https://github.com/openwrt-routing/packages/issues/286
TL;DR miniupnpd rules get processed before fw3 rules and thus can
override existing/intended redirects.  Ideally the miniupnpd rules would
be last in the relevant chains, unfortunately fw3 can sometimes use the
last rule as a REJECT.  Put miniupnpd rules as penultimate.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-05-04 09:03:56 +01:00