[patch] add support for MINIUPNPC_API_VERSION >= 18

fix-miniupnpc-api-breakage.patch (text/plain), 1.44 KB, created by Torsten Kaiser on 2024-06-14 20:12:46 UTC

Adapt to changes from API 18
https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f

--- a/source/network/NetServer.cpp	2022-09-23 21:17:14.000000000 +0200
+++ a/source/network/NetServer.cpp	2024-06-14 21:43:26.572418719 +0200
@@ -302,7 +302,11 @@
 	else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
 #endif
 	{
+#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
+		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress), NULL, 0);
+#else
 		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
+#endif
 		allocatedUrls = ret != 0; // urls is allocated on non-zero return values
 	}
 	else
@@ -321,9 +325,18 @@
 		LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL);
 		break;
 	case 2:
+#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
+		LOGMESSAGE("Net server: found a valid IGD with a reserved address = %s, will try to continue anyway", urls.controlURL);
+		break;
+	case 3:
+		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
+		break;
+	case 4:
+#else
 		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
 		break;
 	case 3:
+#endif
 		LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %s, will try to continue anyway", urls.controlURL);
 		break;
 	default: