- Added a compile flag to disable/enable port mapper

Author: x64-dev

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

@@ -4,6 +4,8 @@
 #define GENERALS_ONLINE
 #endif
 
+//#define USE_PORT_MAPPER 1
+
 #if !defined(_DEBUG)
 //#define USE_TEST_ENV 1
 #endif

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

@@ -406,7 +406,9 @@ class NGMP_OnlineServicesManager
 
 	void Tick();
 
+#if defined(USE_PORT_MAPPER)
 	PortMapper& GetPortMapper() { return m_PortMapper; }
+#endif
 
 	void ProcessMOTD(const char* szMOTD)
 	{
@@ -442,7 +444,9 @@ class NGMP_OnlineServicesManager
 	ServiceConfig& GetServiceConfig() { return m_ServiceConfig; }
 
 private:
+#if defined(USE_PORT_MAPPER)
 	PortMapper m_PortMapper;
+#endif
 
 	ServiceConfig m_ServiceConfig;
 

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

@@ -1,5 +1,7 @@
 #pragma once
 
+#if defined(USE_PORT_MAPPER)
+
 //#define DISABLE_UPNP 1
 //#define DISABLE_NATPMP 1
 //#define DISABLE_PCP 1
@@ -98,4 +100,4 @@ class PortMapper
 	int m_PCPMappingHandle = -1;
 };
 
-// TODO_PORT: What if everything fails? does it still return?
+#endif

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

@@ -272,6 +272,7 @@ static void updateNumPlayersOnline(void)
 		GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L" "), GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
 
 		// NETWORK CAPS
+#if defined(USE_PORT_MAPPER)
 		bool bHasPortMapped = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasPortOpen();
 		PortMapper::EMappingTech mappingTechUsed = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetPortMappingTechnologyUsed();
 
@@ -314,6 +315,7 @@ static void updateNumPlayersOnline(void)
 					strPortState = "No Port Mapped";
 				}
 		}
+#endif
 
 		// END NETWORK CAPS
 		while (aMotd.nextToken(&aLine, "\n"))
@@ -350,9 +352,7 @@ static void updateNumPlayersOnline(void)
 			GadgetListBoxAddEntryText(listboxInfo, line, c, -1, -1);
 		}
 
-		// add network caps
-
-		//ECapabilityState NATDirectConnect = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().HasDirectConnect();
+#if defined(USE_PORT_MAPPER)
 		int preferredPort = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
 		{
 			Color c = GameMakeColor(255, 194, 15, 255);
@@ -366,33 +366,8 @@ static void updateNumPlayersOnline(void)
 			// network port
 			line.format(L"Network Port: %d (%hs)", preferredPort, strPortState.c_str());
 			GadgetListBoxAddEntryText(listboxInfo, line, c, -1, -1);
-
-			/*
-			// direct connect
-			line.format(L"Direct Connect: %hs%hs",
-				NATDirectConnect == ECapabilityState::UNDETERMINED ? "Still Being Determined..." : NATDirectConnect == ECapabilityState::SUPPORTED ? "Supported" : "Unsupported",
-#if !defined(GENERALS_ONLINE_PORT_MAP_FIREWALL_OVERRIDE_PORT)
-				(mappingTechUsed == PortMapper::EMappingTech::MANUAL) ? (NATDirectConnect == ECapabilityState::SUPPORTED ? "" : "\n\tWARNING: You have manually set a firewall port which does not appear to be open. Direct connectivity may not work.") : "",
-#else
-				""
-#endif
-			);
-			
-			GadgetListBoxAddEntryText(listboxInfo, line, c, -1, -1);
-			*/
-			
-			/*
-			// relayed connect
-			line.format(L"Relayed Connect: %hs", "Supported");
-			GadgetListBoxAddEntryText(listboxInfo, line, c, -1, -1);
-			
-
-			// server region
-			line.format(L"Server Region: %hs (%dms)", NGMP_OnlineServicesManager::GetInstance()->GetQoSManager().GetPreferredRegionName().c_str(),
-				NGMP_OnlineServicesManager::GetInstance()->GetQoSManager().GetPreferredRegionLatency());
-			GadgetListBoxAddEntryText(listboxInfo, line, c, -1, -1);
-			*/
 		}
+#endif
 
 	}
 }

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

@@ -642,7 +642,11 @@ NetworkMesh::NetworkMesh()
 			NetworkLog(ELogVerbosity::LOG_RELEASE, "[STEAM NETWORKING LOGFUNC] %s", pszMsg);
 		});
 
+#if defined(USE_PORT_MAPPER)
 	int localPort = serviceConf.use_mapped_port ? NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort() : 0;
+#else
+	int localPort = 0;
+#endif
 
 	// create sockets
 	SteamNetworkingConfigValue_t opt;
@@ -772,7 +776,12 @@ void NetworkMesh::StartConnectionSignalling(int64_t remoteUserID, uint16_t prefe
 
 	ServiceConfig& serviceConf = pOnlineServicesMgr->GetServiceConfig();
 
+#if defined(USE_PORT_MAPPER)
 	int g_nLocalPort = serviceConf.use_mapped_port ? pOnlineServicesMgr->GetPortMapper().GetOpenPort() : 0;
+#else
+	int g_nLocalPort = 0;
+#endif
+
 	int g_nVirtualPortRemote = serviceConf.use_mapped_port ? preferredPort : 0;
 
 	// Our remote and local port don't match, so we need to set it explicitly

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

@@ -75,7 +75,9 @@ void NGMP_OnlineServices_AuthInterface::GoToDetermineNetworkCaps()
 {
 	// move on to network capabilities section
 	// this is done in the background, but we'll update the MOTD when done to show the latest status
+#if defined(USE_PORT_MAPPER)
 	NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().DetermineLocalNetworkCapabilities();
+#endif
 
 	// GET MOTD
 	std::string strURI = NGMP_OnlineServicesManager::GetAPIEndpoint("MOTD");

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

@@ -434,7 +434,9 @@ void NGMP_OnlineServicesManager::Tick()
 		m_pAuthInterface->Tick();
 	}
 
+#if defined(USE_PORT_MAPPER)
 	m_PortMapper.Tick();
+#endif
 
 	if (m_pRoomInterface != nullptr)
 	{

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

@@ -853,7 +853,12 @@ void NGMP_OnlineServices_LobbyInterface::JoinLobby(LobbyEntry lobbyInfo, std::st
 			bool bHasMap = TheMapCache->findMap(AsciiString(lobbyInfo.map_path.c_str()));
 
 			nlohmann::json j;
+#if defined(USE_PORT_MAPPER)
 			j["preferred_port"] = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
+#else
+			j["preferred_port"] = 0;
+#endif
+
 			j["has_map"] = bHasMap;
 
 			if (!strPassword.empty())
@@ -1088,7 +1093,11 @@ void NGMP_OnlineServices_LobbyInterface::CreateLobby(UnicodeString strLobbyName,
 			j["map_path"] = sanitizedMapPath.str();
 			j["map_official"] = bIsOfficial;
 			j["max_players"] = initialMaxSize;
+#if defined(USE_PORT_MAPPER)
 			j["preferred_port"] = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
+#else
+			j["preferred_port"] = 0;
+#endif
 			j["vanilla_teams"] = bVanillaTeamsOnly;
 			j["track_stats"] = bTrackStats;
 			j["starting_cash"] = startingCash;
@@ -1157,7 +1166,11 @@ void NGMP_OnlineServices_LobbyInterface::CreateLobby(UnicodeString strLobbyName,
 							me.user_id = m_CurrentLobby.owner;
 							me.display_name = pAuthInterface->GetDisplayName();
 							me.m_bIsReady = true; // host is always ready
+#if defined(USE_PORT_MAPPER)
 							me.preferredPort = NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().GetOpenPort();
+#else
+							me.preferredPort = 0;
+#endif
 
 							m_CurrentLobby.members.push_back(me);
 

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

@@ -1,3 +1,5 @@
+#if defined(USE_PORT_MAPPER)
+
 #if defined(_DEBUG)
 //#define DISABLE_PORT_MAPPING 1
 #endif
@@ -519,3 +521,4 @@ void PortMapper::InvokeCallback()
 		NGMP_OnlineServicesManager::GetInstance()->m_cbPortMapperCallback();
 	}
 }
+#endif