- Forcefully release the NAT holepunch port binding when attempting to create a game network mesh

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h

@@ -210,7 +210,7 @@ class NetworkMesh
 
 	void ConnectToUserViaRelay(Int64 user_id);
 
-	void ConnectToMesh(LobbyEntry& lobby);
+	bool ConnectToMesh(LobbyEntry& lobby);
 
 	void Disconnect();
 

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/PortMapper.h

@@ -32,6 +32,16 @@ class PortMapper
 		CleanupPorts();
 	}
 
+	void ForceReleaseNATPort()
+	{
+		if (m_NATSocket != INVALID_SOCKET)
+		{
+			closesocket(m_NATSocket);
+			WSACleanup();
+			m_NATSocket = INVALID_SOCKET;
+		}
+	}
+
 	void Tick();
 	void StartNATCheck();
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp

@@ -458,7 +458,7 @@ void NetworkMesh::ConnectToSingleUser(ENetAddress addr, Int64 user_id, bool bIsR
 // TODO_NGMP: enet_host_destroy(server);
 // TODO_NGMP: enet_host_destroy(client);
 static bool m_bEnetInitialized = false;
-void NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
+bool NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
 {
 	// TODO_NGMP: Cleanup properly
 	m_mapConnections.clear();
@@ -470,7 +470,7 @@ void NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
 			// TODO_NGMP: Handle error
 			NetworkLog("Network Init Failed!");
 			m_bEnetInitialized = false;
-			return;
+			return false;
 		}
 		else
 		{
@@ -482,6 +482,8 @@ void NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
 	// create server
 	if (enetInstance == nullptr)
 	{
+		NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().ForceReleaseNATPort();
+
 		server_address.host = ENET_HOST_ANY;
 		server_address.port = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
 		NetworkLog("Network Listening on port %d!", server_address.port);
@@ -497,7 +499,7 @@ void NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
 			// TODO_NGMP: Handle error
 			NetworkLog("Network Listen Failed!");
 			m_bEnetInitialized = false;
-			return;
+			return false;
 		}
 	}
 
@@ -509,6 +511,8 @@ void NetworkMesh::ConnectToMesh(LobbyEntry& lobby)
 			ConnectToSingleUser(lobbyMember);
 		}
 	}
+
+	return true;
 }
 
 void NetworkMesh::Disconnect()

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/PortMapper.cpp

@@ -293,16 +293,8 @@ void PortMapper::DetermineLocalNetworkCapabilities()
 void PortMapper::ForwardPort_UPnP()
 {
 #if defined(DISABLE_UPNP)
-	bool bSucceeded = false;
-
-	// NOTE: dont hard fail here. not finding an exact match might be OK, some routers mangle data etc
-	NetworkLog("PortMapper: UPnP Mapping was not validated on router, this is likely OK");
-	if (!m_bPortMapper_AnyMappingSuccess.load() && bSucceeded) // dont overwrite a positive value with a negative
-	{
-		m_bPortMapper_AnyMappingSuccess.store(true);
-		m_bPortMapper_MappingTechUsed.store(EMappingTech::UPNP);
-	}
 	m_bPortMapper_UPNP_Complete.store(true);
+	return;
 #else
 	const uint16_t port = m_PreferredPort.load();
 	int error = 0;
@@ -362,6 +354,7 @@ void PortMapper::ForwardPort_NATPMP()
 {
 #if defined(DISABLE_NATPMP)
 	m_bPortMapper_NATPMP_Complete.store(true);
+	return;
 #else
 
 	NetworkLog("PortMapper: NAT-PMP started");