From 60a66c7fac04e1d8d325f13f9fef7c79cf46c1ba Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Thu, 18 Jul 2024 15:34:05 +0200
Subject: [PATCH] update miniupnp to miniupnpc_2_2_8

---
 external/CMakeLists.txt     |  2 +-
 src/solanaceae/tox_upnp.cpp | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3a43897..e9a39cc 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -18,7 +18,7 @@ if (NOT TARGET miniupnpc::miniupnpc)
 	set(UPNPC_NO_INSTALL ON CACHE BOOL "" FORCE)
 	FetchContent_Declare(miniupnpc
 		GIT_REPOSITORY https://github.com/miniupnp/miniupnp.git
-		GIT_TAG miniupnpc_2_2_7 # meh
+		GIT_TAG miniupnpc_2_2_8 # meh
 		SOURCE_SUBDIR miniupnpc
 	)
 	FetchContent_MakeAvailable(miniupnpc)
diff --git a/src/solanaceae/tox_upnp.cpp b/src/solanaceae/tox_upnp.cpp
index 5492f0c..f47bbb5 100644
--- a/src/solanaceae/tox_upnp.cpp
+++ b/src/solanaceae/tox_upnp.cpp
@@ -26,6 +26,7 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
 		UPNPUrls urls { nullptr, nullptr, nullptr, nullptr, nullptr, };
 		IGDdatas data;
 		char lanaddr[64] = "unset";
+		char wanaddr[64] = "unset";
 
 		while (!_quit) {
 			if (seconds_since_last < 60*60) {
@@ -49,7 +50,13 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
 				std::cerr << "  " << d->descURL << " " << d->st << " " << d->usn << "\n";
 			}
 
-			auto res = UPNP_GetValidIGD(devices.get(), &urls, &data, lanaddr, sizeof(lanaddr));
+			auto res = UPNP_GetValidIGD(
+				devices.get(),
+				&urls,
+				&data,
+				lanaddr, sizeof(lanaddr),
+				wanaddr, sizeof(wanaddr)
+			);
 
 			if (res < 1) {
 				std::cerr << "TUPNP error: no valid connected IGD has been found\n";
@@ -60,7 +67,7 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
 				continue;
 			}
 
-			std::cerr << "TUPNP: valid IGD found (" << res << "), local ip: " << lanaddr << "\n";
+			std::cerr << "TUPNP: valid IGD found (" << res << "), lan ip: " << lanaddr << ", wan ip: " << wanaddr << "\n";
 			break;
 		}