sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-12 23:31:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-p2p/monero-cli: fix build with miniupnpc 2.2.8

Browse source 
PR: 280298
This commit is contained in:
Dirk Meyer 2024-07-19 17:08:14 +02:00
parent 5e1d5afcab
commit 49c08288de
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net-p2p/monero-cli/files/patch-src_p2p_net__node.inl
View file

@ -1,8 +1,8 @@
--- src/p2p/net_node.inl.orig 2018-06-06 19:28:51.925128000 UTC
+++ src/p2p/net_node.inl 2018-06-06 19:29:06.877331000 UTC
@@ -49,9 +49,9 @@
#include "storages/levin_abstract_invoke2.h"
--- src/p2p/net_node.inl.orig 2023-10-02 19:28:11 UTC
+++ src/p2p/net_node.inl
@@ -60,9 +60,9 @@
#include "cryptonote_core/cryptonote_core.h"
#include "net/parse.h"
-#include <miniupnp/miniupnpc/miniupnpc.h>
-#include <miniupnp/miniupnpc/upnpcommands.h>
@ -13,3 +13,27 @@
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
@@ -2989,7 +2989,11 @@ namespace nodetool
UPNPUrls urls;
IGDdatas igdData;
char lanAddress[64];
+#if MINIUPNPC_API_VERSION >= 18
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, NULL, 0);
+#else
result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
+#endif
freeUPNPDevlist(deviceList);
if (result > 0) {
if (result == 1) {
@@ -3057,7 +3061,11 @@ namespace nodetool
UPNPUrls urls;
IGDdatas igdData;
char lanAddress[64];
+#if MINIUPNPC_API_VERSION >= 18
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, NULL, 0);
+#else
result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
+#endif
freeUPNPDevlist(deviceList);
if (result > 0) {
if (result == 1) {