Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upnp: add compatibility for miniupnpc 2.2.8 #423

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Sep 27, 2024

This PR backports bitcoin/bitcoin#30283 to resolve the current CI issues with Homebrew's miniupnpc package version 2.2.8.

See: miniupnp/miniupnp@c0a50ce

The return value of 2 now indicates:
"A valid connected IGD has been found but its IP address is reserved (non routable)"

We continue to ignore any return value other than 1.
Copy link
Contributor

@MarnixCroes MarnixCroes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm ACK 52dfa7d

Copy link
Contributor

@pablomartin4btc pablomartin4btc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 52dfa7d

CI error regarding `miniupnpc` has been fixed.

Before:

mapport.cpp:167:9: error: no matching function for call to 'UPNP_GetValidIGD'
    r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
        ^~~~~~~~~~~~~~~~
/usr/local/include/miniupnpc/miniupnpc.h:122:1: note: candidate function not viable: requires 7 arguments, but 5 were provided
UPNP_GetValidIGD(struct UPNPDev * devlist,
^
1 error generated.

@hebasto hebasto merged commit 43cdb75 into bitcoin-core:main Sep 27, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants