- Plugin fix + latest version

Author: x64-dev

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

@@ -13,7 +13,7 @@
 //#define USE_MAULLER_ONEDRIVE_FIX 1
 //#define USE_STUBBJAX_TRANSPORT_CONTAIN_FIX 1
 
-#define GENERALS_ONLINE_VERSION_STRING "100126" // NOTE: Format is critical here for Sentry to work
+#define GENERALS_ONLINE_VERSION_STRING "100126_QFE2" // NOTE: Format is critical here for Sentry to work
 
 #define GENERALS_ONLINE_DISABLE_TEXTURE_FILTERING_AND_AA 1
 

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

@@ -731,6 +731,16 @@ NetworkMesh::NetworkMesh()
 		return;
 	}
 
+	// When the anti-cheat plugin owns the transport, no Steam connection is ever
+	// created or accepted by this mesh - StartConnectionSignalling() goes
+	// straight to the plugin. Taking a Steam listen socket we never use only
+	// risks colliding with a previous mesh on P2P vport 0, so skip it.
+	if (AnticheatPlugInterface::DoesACPluginProvideSecureGameTransport())
+	{
+		m_bInitialized = true;
+		return;
+	}
+
 	std::vector<SteamNetworkingConfigValue_t> vecListenOpts;
 	SteamNetworkingConfigValue_t opt;
 	opt.SetInt32(k_ESteamNetworkingConfig_SymmetricConnect, 1);
@@ -1124,15 +1134,18 @@ void NetworkMesh::Disconnect()
 	{
 		AnticheatPlugInterface::DisconnectAll();
 	}
-	else
-	{
-		if (SteamNetworkingSockets() && m_hListenSock != k_HSteamListenSocket_Invalid)
-		{
-			SteamNetworkingSockets()->CloseListenSocket(m_hListenSock);
-		}
 
-		m_hListenSock = k_HSteamListenSocket_Invalid;
+	// The listen socket is created unconditionally in the constructor, so it must
+	// be released unconditionally too. Skipping this when the anti-cheat plugin
+	// owns the transport leaks the socket, and the next NetworkMesh then fails
+	// with "Already have a listen socket on P2P vport 0" - which makes
+	// IsInitialized() false and aborts the second lobby join.
+	if (SteamNetworkingSockets() && m_hListenSock != k_HSteamListenSocket_Invalid)
+	{
+		SteamNetworkingSockets()->CloseListenSocket(m_hListenSock);
 	}
+
+	m_hListenSock = k_HSteamListenSocket_Invalid;
 }
 
 void NetworkMesh::Tick()