diff options
| author | merge-script <fanquake@gmail.com> | 2024-06-24 13:37:23 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-06-24 13:37:23 +0100 |
| commit | 6bbfdcfb6d6a620216eb8cdb50c238113cd77e6e (patch) | |
| tree | 82e5d8bdcd504f9cad00c8af50827faeaeafc6ed | |
| parent | d10cf127e576a8066a417aa77d49a6c726cb16af (diff) | |
| parent | 10413ac46c07d3a45dc9d71818f59ffdb1129032 (diff) | |
Merge bitcoin/bitcoin#30319: [26.x] upnp: fix build with miniupnpc 2.2.8
10413ac46c07d3a45dc9d71818f59ffdb1129032 doc: add 30283 cherry-pick to rel notes (fanquake)
391ce775f4661d2b9faa616b5d3d0511b53b79b2 upnp: add compatibility for miniupnpc 2.2.8 (Cory Fields)
Pull request description:
Backports https://github.com/bitcoin/bitcoin/pull/30283 to the 26.x branch.
ACKs for top commit:
edilmedeiros:
ACK 10413ac46c07d3a45dc9d71818f59ffdb1129032
theuni:
ACK 10413ac46c07d3a45dc9d71818f59ffdb1129032
Tree-SHA512: 4a0f4eceefd5bbf9c97d19c4890b85963d56449856a56e6fe24161d3d6f37332de719da342d6c00ee67f2cd9434d849809a3cdc51719dc93219ec218c35a9f97
| -rw-r--r-- | doc/release-notes.md | 2 | ||||
| -rw-r--r-- | src/mapport.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index 27b8172b1b..92194a9a2d 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -61,6 +61,7 @@ Notable changes - #29747: depends: fix mingw-w64 Qt DEBUG=1 build - #29985: depends: Fix build of Qt for 32-bit platforms with recent glibc - #30151: depends: Fetch miniupnpc sources from an alternative website +- #30283: upnp: fix build with miniupnpc 2.2.8 ### Misc @@ -76,6 +77,7 @@ Thanks to everyone who directly contributed to this release: - Antoine Poinsot - Ava Chow +- Cory Fields - dergoegge - fanquake - glozow diff --git a/src/mapport.cpp b/src/mapport.cpp index 08b365db4b..f58d8ced15 100644 --- a/src/mapport.cpp +++ b/src/mapport.cpp @@ -163,8 +163,11 @@ static bool ProcessUpnp() struct UPNPUrls urls; struct IGDdatas data; int r; - +#if MINIUPNPC_API_VERSION <= 17 r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); +#else + r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0); +#endif if (r == 1) { if (fDiscover) { |