From db7540654844ff17e47024a9bf25339bd620c7bb Mon Sep 17 00:00:00 2001 From: Sergey Kroshnin Date: Tue, 27 Apr 2021 18:01:09 +0300 Subject: [PATCH] Update MiniUPnP to version 2.2.2 (#3131) * Update MiniUPnP to version 2.2.2 Changelog: https://github.com/miniupnp/miniupnp/blob/miniupnpc_2_2_2/miniupnpc/Changelog.txt * Remove v2.1 miniupnpc include directories fix --- CMakeLists.txt | 5 ----- miniupnp | 2 +- nano/node/portmapping.cpp | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e58ab41..70384f03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,11 +422,6 @@ set(UPNPC_BUILD_SHARED OFF CACHE BOOL "") add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL) -# FIXME: This fixes miniupnpc include directories without modifying miniupnpc's -# CMakeLists.txt but should be set there -set_target_properties( - libminiupnpc-static PROPERTIES INTERFACE_INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/miniupnp/miniupnpc") set(BUILD_SHARED OFF diff --git a/miniupnp b/miniupnp index 582375b6..81029a86 160000 --- a/miniupnp +++ b/miniupnp @@ -1 +1 @@ -Subproject commit 582375b64f347d6ef1a4dc3478ff3678ea923f80 +Subproject commit 81029a860baf1f727903e5b85307903b3f40cbc8 diff --git a/nano/node/portmapping.cpp b/nano/node/portmapping.cpp index b53199c1..e2859a89 100644 --- a/nano/node/portmapping.cpp +++ b/nano/node/portmapping.cpp @@ -1,12 +1,12 @@ #include #include +#include +#include + #include #include -#include -#include - nano::port_mapping::port_mapping (nano::node & node_a) : node (node_a), protocols ({ { { "TCP", boost::asio::ip::address_v4::any (), 0, true }, { "UDP", boost::asio::ip::address_v4::any (), 0, !node_a.flags.disable_udp } } })