Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
3.1 kB · 79 lines
1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980diff --git a/external/CMakeLists.txt b/external/CMakeLists.txtindex 538e4d215..cc4b0a346 100644--- a/external/CMakeLists.txt+++ b/external/CMakeLists.txt@@ -35,26 +35,14 @@ # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with # others. -find_package(Miniupnpc REQUIRED)--message(STATUS "Using in-tree miniupnpc")-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE)-add_subdirectory(miniupnp/miniupnpc)-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)-if(MSVC)- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")-elseif(NOT MSVC)- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")-endif()-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")-endif()--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)+find_package(PkgConfig REQUIRED)+pkg_check_modules(MINIUPNPC REQUIRED miniupnpc)+link_libraries(${MINIUPNPC_LIBRARIES})+include_directories(${MINIUPNPC_INCLUDE_DIRS}) +find_package(RapidJSON) find_package(Unbound)+find_library(RANDOMX_LIBRARY randomx) if(NOT UNBOUND_INCLUDE_DIR) die("Could not find libunbound")@@ -70,4 +58,3 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen)-add_subdirectory(randomx EXCLUDE_FROM_ALL)diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inlindex 884a7b5fc..24c10334e 100644--- a/src/p2p/net_node.inl+++ b/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>-#include <miniupnp/miniupnpc/upnperrors.h>+#include <miniupnpc/miniupnpc.h>+#include <miniupnpc/upnpcommands.h>+#include <miniupnpc/upnperrors.h> #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"@@ -2989,7 +2989,8 @@ namespace nodetool UPNPUrls urls; IGDdatas igdData; char lanAddress[64];- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);+ char wanAddress[64];+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); freeUPNPDevlist(deviceList); if (result > 0) { if (result == 1) {@@ -3057,7 +3058,8 @@ namespace nodetool UPNPUrls urls; IGDdatas igdData; char lanAddress[64];- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);+ char wanAddress[64];+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); freeUPNPDevlist(deviceList); if (result > 0) { if (result == 1) {