PortMapper now respects use Firewall port override setting

Author: x64-dev

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

@@ -15,7 +15,8 @@ enum ECapabilityState : uint8_t
 {
 	UNDETERMINED,
 	UNSUPPORTED,
-	SUPPORTED
+	SUPPORTED,
+	OVERRIDDEN
 };
 
 class PortMapper

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp

@@ -291,18 +291,56 @@ static void updateNumPlayersOnline(void)
 
 
 		//<hexcol>%hs for colors
-		ECapabilityState NATDirectConnect = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasDirectConnect();
 		ECapabilityState capUPnP = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasUPnP();
 		ECapabilityState capNATPMP = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasNATPMP();
+
+		std::string strUPnPState;
+		if (capUPnP == ECapabilityState::UNDETERMINED)
+		{
+			strUPnPState = "Still Determining...";
+		}
+		else if (capUPnP == ECapabilityState::SUPPORTED)
+		{
+			strUPnPState = "Supported";
+		}
+		else if (capUPnP == ECapabilityState::UNSUPPORTED)
+		{
+			strUPnPState = "Unsupported";
+		}
+		else
+		{
+			strUPnPState = "User Overridden";
+		}
+
+		std::string strNATPMPState;
+		if (capNATPMP == ECapabilityState::UNDETERMINED)
+		{
+			strNATPMPState = "Still Determining...";
+		}
+		else if (capNATPMP == ECapabilityState::SUPPORTED)
+		{
+			strNATPMPState = "Supported";
+		}
+		else if (capNATPMP == ECapabilityState::UNSUPPORTED)
+		{
+			strNATPMPState = "Unsupported";
+		}
+		else
+		{
+			strNATPMPState = "User Overridden";
+		}
+
+		ECapabilityState NATDirectConnect = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasDirectConnect();
 		bool bHasPortMapped = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasPortOpen();
 		bool bHasPortMappedUPnP = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasPortOpenUPnP();
 		int preferredPort = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
-		headingStr.format(L"Welcome to Generals Online for Zero Hour.\n \nNetwork Capabilities:\n\tUPnP: %hs\n\tNAT-PMP: %hs\n\tPort Mapped: %hs\n\tNetwork Port: %d\n\tDirect Connect: %hs",
-			capUPnP == ECapabilityState::UNDETERMINED ? "Still Determining..." : capUPnP == ECapabilityState::SUPPORTED ? "Supported" : "Unsupported",
-			capNATPMP == ECapabilityState::UNDETERMINED ? "Still Determining..." : capNATPMP == ECapabilityState::SUPPORTED ? "Supported" : "Unsupported",
+		headingStr.format(L"Welcome to Generals Online for Zero Hour.\n \nNetwork Capabilities:\n\tUPnP: %hs\n\tNAT-PMP: %hs\n\tPort Mapped: %hs\n\tNetwork Port: %d\n\tDirect Connect: %hs%hs",
+			strUPnPState.c_str(),
+			strNATPMPState.c_str(),
 			bHasPortMapped ? (bHasPortMappedUPnP ? "Yes (UPnP)" : "Yes (NAT-PMP)") : "No",
 			preferredPort,
-			NATDirectConnect == ECapabilityState::UNDETERMINED ? "Still Determining..." : NATDirectConnect == ECapabilityState::SUPPORTED ? "Supported" : "Unsupported"
+			NATDirectConnect == ECapabilityState::UNDETERMINED ? "Still Determining..." : NATDirectConnect == ECapabilityState::SUPPORTED ? "Supported" : "Unsupported",
+			capUPnP == ECapabilityState::OVERRIDDEN ? "\n\tWARNING: You have manually set a firewall port which does not appear to be open. Direct connectivity may not work." : ""
 		);
 
 		while (headingStr.nextToken(&line, UnicodeString(L"\n")))

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

@@ -342,9 +342,11 @@ AsciiString NGMPGame::generateLadderGameResultsPacket(void)
 void NGMPGame::launchGame(void)
 {
 	// TODO_NGMP: Better way of doing this, plus maybe load from file?
-	//TheWritableGlobalData->m_benchmarkTimer = 999999999;
-	//TheWritableGlobalData->m_debugShowGraphicalFramerate = true;
+#if defined(_DEBUG)
+	TheWritableGlobalData->m_benchmarkTimer = 999999999;
+	TheWritableGlobalData->m_debugShowGraphicalFramerate = true;
 	TheWritableGlobalData->m_showMetrics = true;
+#endif
 
 	setGameInProgress(TRUE);
 

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

@@ -248,10 +248,25 @@ void PortMapper::BackgroundThreadRun()
 
 void PortMapper::DetermineLocalNetworkCapabilities(std::function<void(void)> callbackDeterminedCaps)
 {
-	NetworkLog("[PortMapper] Start DetermineLocalNetworkCapabilities");
 	// store callback
 	m_callbackDeterminedCaps = callbackDeterminedCaps;
 
+	if (TheGlobalData->m_firewallPortOverride != 0)
+	{
+		m_capUPnP = ECapabilityState::OVERRIDDEN;
+		m_capNATPMP = ECapabilityState::OVERRIDDEN;
+		m_PreferredPort = TheGlobalData->m_firewallPortOverride;
+
+		NetworkLog("[PortMapper] Firewall port override is set (%d), skipping port mapping and going straight to connection check", m_PreferredPort);
+		m_bPortMapperWorkComplete.store(true);
+
+		// dont trigger callbakc, just say we did the mapping, so we'll continue with direct connect check - this is still valid
+		
+		return;
+	}
+	NetworkLog("[PortMapper] Start DetermineLocalNetworkCapabilities");
+	
+
 	// reset status
 	m_bPortMapperWorkComplete.store(false);