Commit Graph

8 Commits

Author SHA1 Message Date
Jitao Lu 061f81ff6d miniupnpd: Don't override ipv6_listening_ip
Fixes: https://github.com/openwrt/packages/issues/14145
Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
(cherry picked from commit c89a1f3e8b)
2020-12-08 23:22:46 -08:00
Jitao Lu e82884cafb miniupnpd: Pass ipv6 addr to ipv6_listening_ip
Unlike ipv4, this option is supposed to be an IP address, otherwise, an
error occurs on startup:

    can't parse "br-lan" as valid IPv6 listening address

Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
(cherry picked from commit 7077fd8c79)
2020-12-03 17:58:39 -08:00
Chen Minqiang 808a67b35d 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>
(cherry picked from commit b76aa99194)
2020-11-29 17:26:32 -08:00
Alexey Kuznetsov c614914da0 miniupnpd: add miniupnpd ipv6_disable option, #11971 close
Signed-off-by: Alexey Kuznetsov <axet@me.com>
(cherry picked from commit 9b6537b487)
2020-09-20 17:56:12 -07:00
Kevin Darbyshire-Bryant 5cb388497e miniupnpd: improve hotplug & interface handling
The existing interface selection/detection code was incomprehensible at
worst and convoluted at best.  The uci config file suggested it
understood an external ipv6 interface but in reality the init script
took no notice.  Re-work it so it is at least comprehendible and takes
notice of ipv6 interface details if specified.

Update the hotplug script to use the same interface selection/detection
code as the init script and take note of ipv6 interface selection, only
restarting miniupnpd on interface up events and only if that interface
isn't already known (for that ip class) by miniupnpd.

For me this has solved numerous 'flaky' startup problems, especially
with regard to ipv6.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 295d77943c)
2020-06-28 14:00:24 -07:00
Kevin Darbyshire-Bryant 83ff6c38f2 miniupnpd: fix sh syntax error
Add "use_stun" default to prevent sh: out of range error introduced by
c61614a84

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 0f1e7d32af)
2020-04-17 15:21:56 -07:00
Rosen Penev 1fe1c80d66 miniupnpd: convert to procd
Massive cleanup of the shell script. Many issues were fixed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit c61614a849)
2020-04-17 15:21:35 -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