[Net] Drop support of the insecure miniUPnPc versions#2330
Merged
furszy merged 6 commits intoMay 8, 2021
Conversation
1 task
The minimum supported miniUPnPc API version is set to 10.
Also fixes behavior when libminiupnpc is not installed.
Fuzzbawls
force-pushed
the
2021_net-drop-ancient-upnp-support
branch
from
d8db194 to
60cd984
Compare
furszy
approved these changes
May 5, 2021
random-zebra
added a commit
that referenced
this pull request
Jun 24, 2021
c198797 build: compile libnatpmp with -DNATPMP_STATICLIB on Windows (Fuzzbawls) f2b62a3 build: use newer source for libnatpmp (fanquake) 8143139 GUI: Re-work port mapping saving (Fuzzbawls) c4300c0 Clang-Tidy up mapport.cpp (Fuzzbawls) f1951b5 Add libnatpmp to nightly snapcraft builds (Fuzzbawls) d48ef00 doc: Add release notes (Fuzzbawls) 7886374 doc: Add libnatpmp stuff (Fuzzbawls) cf992d0 ci: Add libnatpmp-dev package to some builds (Fuzzbawls) 5a5e3cf gui: Add NAT-PMP network option (Fuzzbawls) 9a4ba48 net: Add -natpmp command line option (Fuzzbawls) 9927296 net: Add NAT-PMP to port mapping loop (Hennadii Stepanov) 84cd118 net: Add initial libnatpmp support (Fuzzbawls) faed148 gui: Apply port mapping changes on save (Fuzzbawls) 266d322 scripted-diff: Rename UPnP stuff (Fuzzbawls) 06dc0dd net: Add flags for port mapping protocols (Fuzzbawls) 2abea67 net: Keep trying to use UPnP when -upnp=1 (Hennadii Stepanov) d2fa5c4 Make ThreadMapPort static (Fuzzbawls) 7532090 refactor: Replace magic number with named constant (Hennadii Stepanov) c481f62 refactor: Move port mapping code to its own module (Fuzzbawls) Pull request description: Built on top of #2330, this backports bitcoin#18077 and bitcoin#21209 to add NAT-PMP port forwarding support, which can function along side of or instead of UPnP. Similar to how UPnP is treated, NAT-PMP support will be compiled in if the library is found, but the functionality is disabled by default unless passing `--enable-natpmp-default` to `configure`, or by using the `-natpmp` command line option at startup. A checkbox has also been added to the settings area of the GUI that allows for on-the-fly enabling/disabling of the port mapping features when saving the settings. - [x] #2330 to be merged first. ACKs for top commit: furszy: upnp and code check ACK c198797. random-zebra: utACK c198797 after rebase, and merging... Tree-SHA512: e4b47dcd9589a1fd7a1bf3254c319d80af92c878e1657a17a169e49aa888aea33921a9428da3e8d6ee023d971143cf4a495e5a32957370174cff57e6cc6f2cc0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of bitcoin#15993
This results in a rejection of older versions of miniupnpc for both autotools and CMake build systems. API Version 10 was used to maintain compatibility with Ubuntu Xenial (which uses a patched version of miniupnpc but still reports API version 10) and Debian 8 (which is not fully patched).
Miniupnp support as a whole remains disabled by default