Skip to content

Commit

Permalink
Merge #423: upnp: add compatibility for miniupnpc 2.2.8
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hebasto committed Sep 27, 2024
2 parents 84c4372 + 52dfa7d commit 43cdb75
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/mapport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 43cdb75

Please sign in to comment.