Skip to content

Commit 43cdb75

Browse files
committed
Merge #423: upnp: add compatibility for miniupnpc 2.2.8
52dfa7d upnp: add compatibility for miniupnpc 2.2.8 (Cory Fields) Pull request description: This PR backports bitcoin/bitcoin#30283 to resolve the current CI issues with Homebrew's `miniupnpc` package version 2.2.8. ACKs for top commit: MarnixCroes: lgtm ACK 52dfa7d pablomartin4btc: ACK 52dfa7d Tree-SHA512: 8b2dc204c3c284cdd12f79bb08d47c68052d8b1629b63ab601c30f578ec9866ed86278e6f8facb3dcfd4013cfc1ea8f00da5365b46ccc589f1ea9b543f4d225e
2 parents 84c4372 + 52dfa7d commit 43cdb75

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/mapport.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,11 @@ static bool ProcessUpnp()
163163
struct UPNPUrls urls;
164164
struct IGDdatas data;
165165
int r;
166-
166+
#if MINIUPNPC_API_VERSION <= 17
167167
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
168+
#else
169+
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
170+
#endif
168171
if (r == 1)
169172
{
170173
if (fDiscover) {

0 commit comments

Comments
 (0)