cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-01-31 02:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: fix compatibility with miniupnp API version 18

Browse Source 
- Fix breaking change on UPNP_GetValidIGD by macro condition on
  MINIUPNPC_API_VERSION > 18
- Verbosely log what was returned by UPNP_GetValidIGD - because
  we can detect whether a valid outbound connection was found to
  and unroutable external IP. This helps troubleshooting
  situations where for example an ISP uses CGNAT.

See miniupnp commit c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f for
the full change.

Co-authored-by: Daniel Morante <daniel@morante.net>
This commit is contained in:
Patrick Lodder 2025-03-12 11:55:45 -04:00
parent 5a1421c076
commit 5589241b24
No known key found for this signature in database
GPG Key ID: 7C523F5FBABE80E7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/net.cpp
View File

@ -1488,7 +1488,16 @@ void ThreadMapPort()
struct IGDdatas data;
int r;
// since API version 18 / release 2.2.8
// both signature and return values of UPNP_GetValidIGD have been changed
// see miniupnp commit c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f
#if MINIUPNPC_API_VERSION < 18
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
// r: 1 = success, 2 = not connected, 3 = unrecognized IGD
#else
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
// r: 1 = success, 2 = success but not routable (i.e. CGNAT), 3 = not connected, 4 = unrecognized IGD
#endif // MINIUPNPC_API_VERSION < 18
if (r == 1)
{
if (fDiscover) {
@ -1543,7 +1552,7 @@ void ThreadMapPort()
throw;
}
} else {
LogPrintf("No valid UPnP IGDs found\n");
LogPrintf("No valid UPnP IGDs found: %d\n", r);
freeUPNPDevlist(devlist); devlist = 0;
if (r != 0)
FreeUPNPUrls(&urls);