Merge 32a70562c4 into fa2178ca3e

set max padding size to 32 bytes
Fix UPnP: error 2
2025-03-07 06:09:42 +00:00 · 2025-02-18 18:07:46 +01:00 · 2025-02-17 15:08:22 -05:00 · 2024-08-19 00:07:22 +03:00
2 changed files with 2 additions and 2 deletions
--- a/daemon/UPnP.cpp
+++ b/daemon/UPnP.cpp
@@ -122,7 +122,7 @@ namespace transport
 		err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
 #endif
 		m_upnpUrlsInitialized=err!=0;
-		if (err == UPNP_IGD_VALID_CONNECTED)
+		if (err == UPNP_IGD_VALID_CONNECTED || err == UPNP_IGD_VALID_NOT_CONNECTED)
 		{
 #if (MINIUPNPC_API_VERSION < 18)
 			err = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -2762,7 +2762,7 @@ namespace transport
 	size_t SSU2Session::CreatePaddingBlock (uint8_t * buf, size_t len, size_t minSize)
 	{
 		if (len < 3 || len < minSize) return 0;
-		size_t paddingSize = m_Server.GetRng ()() & 0x0F; // 0 - 15
+		size_t paddingSize = m_Server.GetRng ()() & 0x1F; // 0 - 31
 		if (paddingSize + 3 > len) paddingSize = len - 3;
 		else if (paddingSize + 3 < minSize) paddingSize = minSize - 3;
 		buf[0] = eSSU2BlkPadding;
Author	SHA1	Message	Date
Nikita Misiura	f01118468b	Merge `32a70562c4` into `fa2178ca3e`	2025-02-18 18:07:46 +01:00
orignal	fa2178ca3e	set max padding size to 32 bytes	2025-02-17 15:08:22 -05:00
self-related	32a70562c4	Fix UPnP: error 2	2024-08-19 00:07:22 +03:00