mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-25 05:20:01 +01:00
Merge bitcoin/bitcoin#30043: net: Replace libnatpmp with built-in PCP+NATPMP implementation
5c7cacf649ci: Remove natpmp build option and libnatpmp dependency (laanwj)7e7ec984dadoc: Remove mention of natpmp build options (laanwj)061c3e32a2depends: Drop natpmp and associated option from depends (laanwj)20a18bf6aabuild: Drop libnatpmp from build system (laanwj)7b04709862qt: Changes for built-in PCP+NAT-PMP (laanwj)52f8ef66c6net: Replace libnatpmp with built-in NATPMP+PCP implementation in mapport (laanwj)97c97177cdnet: Add PCP and NATPMP implementation (laanwj)d72df63d16net: Use GetLocalAddresses in Discover (laanwj)e02030432bnet: Add netif utility (laanwj)754e425438crypto: Add missing WriteBE16 function (laanwj) Pull request description: Continues #30005. Closes #17012.. This PR adds PCP (Port Control Protocol) from [RFC6887](https://datatracker.ietf.org/doc/html/rfc6887). This adds, in addition to the existing IPv4 port mapping (which now uses PCP, with fallback to NAT-PMP), support for IPv6 pinholing-that is, opening a port on the firewall to make it reachable. PCP, like NAT-PMP is a simple UDP-based protocol, and the implementation is self-contained, so this gets rid of lthe libnatpnp dependency without adding a new one. It should otherwise be a drop-in replacement. NAT-PMP fallback is implemented so this will not make router support worse. For now it is disabled by default, though in the future (not in this PR) we could consider enable it by default to increase the number of connectable nodes without adding significant attack surface. To test: ```bash bitcoind -regtest -natpmp=1 -debug=net ``` (most of the changes in this PR are, ironically, removing the libnatpmp dependency and associated build system and build docs) ## TODO - [x] Default gateway discovery on Linux / FreeBSD - [x] Default gateway discovery on Windows - [x] Default gateway discovery on MacOS - [x] Either solve FreeBSD compile issue (probably upstream issue) or remove FreeBSD support ## Things to consider for follow-up PRs - https://github.com/bitcoin/bitcoin/pull/30043#discussion_r1658764974 avoid unreachable nets (not given to -onlynet=) - https://github.com/bitcoin/bitcoin/pull/30043#discussion_r1658949236 could announce an addr:port where we do not listen (no -bind) - https://github.com/bitcoin/bitcoin/pull/30043#discussion_r1684368824 could announce the wrong port because it uses GetListenPort() - https://github.com/bitcoin/bitcoin/pull/30043#discussion_r1679709347 if we requested one port but another was assigned, then which one to use in the renewal? - https://github.com/bitcoin/bitcoin/pull/30043#discussion_r1772017020 Use `GetAdapterAddresses` to discover local addresses for Windows ACKs for top commit: Sjors: ACK5c7cacf649achow101: ACK5c7cacf649vasild: ACK5c7cacf649Tree-SHA512: e35b69e56d5f5449a3d48a799f9b7b65107c65eeb3e245c2c1e9d42221e469ca5ead90afae423160601cd664dd553a51c859e04f4492f335b064aae3bf23e3bc
This commit is contained in:
@@ -121,7 +121,7 @@ public:
|
||||
virtual void resetSettings() = 0;
|
||||
|
||||
//! Map port.
|
||||
virtual void mapPort(bool use_upnp, bool use_natpmp) = 0;
|
||||
virtual void mapPort(bool use_upnp, bool use_pcp) = 0;
|
||||
|
||||
//! Get proxy.
|
||||
virtual bool getProxy(Network net, Proxy& proxy_info) = 0;
|
||||
|
||||
Reference in New Issue
Block a user