- Latest plugin code, AC msgs now go via service

x64-dev · x64-dev · commit 2ec0d99c1098 · 2026-05-07T17:46:45.000-04:00
diff --git a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
@@ -480,6 +480,13 @@ void MilesAudioManager::reset()
 void MilesAudioManager::update()
 {
 	AudioManager::update();
+
+	// Check audio device is initialized before updating
+	if (m_digitalHandle == nullptr)
+	{
+		return;  // Audio device not ready, skip update
+	}
+
 	setDeviceListenerPosition();
 	processRequestList();
 	processPlayingList();
@@ -1193,15 +1200,21 @@ void MilesAudioManager::freeAllMilesHandles()
 	std::list<HSAMPLE>::iterator it;
 	for ( it = m_availableSamples.begin(); it != m_availableSamples.end(); /* empty */ ) {
 		HSAMPLE sample = *it;
-		AIL_release_sample_handle(sample);
+		if (sample != nullptr)
+		{
+			AIL_release_sample_handle(sample);
+		}
 		it = m_availableSamples.erase(it);
 	}
 	m_num2DSamples = 0;
 
 	std::list<H3DSAMPLE>::iterator it3D;
 	for ( it3D = m_available3DSamples.begin(); it3D != m_available3DSamples.end(); /* empty */ ) {
 		H3DSAMPLE sample3D = *it3D;
-		AIL_release_3D_sample_handle(sample3D);
+		if (sample3D != nullptr)
+		{
+			AIL_release_3D_sample_handle(sample3D);
+		}
 		it3D = m_available3DSamples.erase(it3D);
 	}
 	m_num3DSamples = 0;
@@ -1440,9 +1453,13 @@ AsciiString MilesAudioManager::getMusicTrackName() const
 void MilesAudioManager::openDevice()
 {
 	if (!TheGlobalData->m_audioOn) {
+		m_digitalHandle = nullptr;
 		return;
 	}
 
+	// Always clear handle at start - only set if initialization succeeds
+	m_digitalHandle = nullptr;
+
 	AIL_set_redist_directory("MSS\\");
 	AIL_startup();
 	Int retval = 0;
@@ -1453,22 +1470,31 @@ void MilesAudioManager::openDevice()
 
 	retval = AIL_quick_startup(audioSettings->m_useDigital, audioSettings->m_useMidi, audioSettings->m_outputRate, audioSettings->m_outputBits, audioSettings->m_outputChannels);
 
-	// Quick handles tells us where to store the various devices. For now, we're only interested in the digital handle.
+	if (!retval) {
+		// Initialization failed - ensure m_digitalHandle stays nullptr and audio is disabled
+		m_digitalHandle = nullptr;
+		setOn(false, AudioAffect_All);
+		return;  // EXIT EARLY - don't continue with invalid device
+	}
+
+	// Only get handles if initialization succeeded
 	AIL_quick_handles(&m_digitalHandle, nullptr, nullptr);
 
-	if (retval) {
-		buildProviderList();
-	} else {
-		// if we couldn't initialize any devices, turn sound off (fail silently)
-		setOn( false, AudioAffect_All );
+	// If we still don't have a valid handle, disable audio
+	if (m_digitalHandle == nullptr) {
+		setOn(false, AudioAffect_All);
+		return;
 	}
 
+	// Device initialized successfully - proceed with setup
+	buildProviderList();
 	selectProvider(TheAudio->getProviderIndex(m_pref3DProvider));
 
 	// Now that we're all done, update the cached variables so that everything is in sync.
 	TheAudio->refreshCachedVariables();
 
 	if (!isValidProvider()) {
+		m_digitalHandle = nullptr;  // Mark as invalid if provider check fails
 		return;
 	}
 
@@ -1478,9 +1504,13 @@ void MilesAudioManager::openDevice()
 //-------------------------------------------------------------------------------------------------
 void MilesAudioManager::closeDevice()
 {
-	freeAllMilesHandles();
-	unselectProvider();
-	AIL_shutdown();
+	if (m_digitalHandle != nullptr)
+	{
+		freeAllMilesHandles();
+		unselectProvider();
+		AIL_shutdown();
+		m_digitalHandle = nullptr;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
@@ -59,7 +59,7 @@ enum EWebSocketMessageID
 	NETWORK_ROOM_MARK_READY = 5,
 	LOBBY_CURRENT_LOBBY_UPDATE = 6,
 	NETWORK_ROOM_LOBBY_LIST_UPDATE = 7,
-	UNUSED_PLACEHOLDER = 8, // this was relay upgrade, was removed. We can re-use it later, but service needs this placeholder
+	ANTICHEAT_MESSAGE = 8,
 	PLAYER_NAME_CHANGE = 9,
 	LOBBY_ROOM_CHAT_FROM_CLIENT = 10,
 	LOBBY_CHAT_FROM_SERVER = 11,
@@ -157,6 +157,8 @@ class WebSocket
 	void SendData_Signalling(int64_t targetUserID, std::vector<uint8_t> vecPayload);
 	void SendData_StartGame();
 
+	void SendData_ACMessage(int64_t targetUserID, std::vector<uint8_t> vecPayload);
+
 	void SendData_ChangeLobbyPassword(UnicodeString& strNewPassword);
 	void SendData_RemoveLobbyPassword();
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -101,6 +101,7 @@
 #include "GameNetwork/NetworkInterface.h"
 extern NetworkInterface * TheNetwork;
 #endif
+#include "ValveNetworkingSockets/steam/isteamnetworkingsockets.h"
 
 
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
@@ -1011,7 +1011,7 @@ void NGMP_OnlineServicesManager::InitSentry()
 
 	sentry_options_set_dsn(options, "https://61750bebd112d279bcc286d617819269@o4509316925554688.ingest.us.sentry.io/4509316927586304");
 	sentry_options_set_database_path(options, strDumpPath.c_str());
-	sentry_options_set_release(options, "generalsonline-client@042826_QFE3_EAC");
+	sentry_options_set_release(options, "generalsonline-client@042826_QFE4_EAC");
 
 #if defined(USE_TEST_ENV)
 	sentry_options_set_environment(options, "test");
@@ -1190,6 +1190,16 @@ void WebSocket::SendData_StartGame()
 }
 
 
+void WebSocket::SendData_ACMessage(int64_t targetUserID, std::vector<uint8_t> vecPayload)
+{
+    nlohmann::json j;
+    j["msg_id"] = EWebSocketMessageID::ANTICHEAT_MESSAGE;
+    j["target_user_id"] = targetUserID;
+    j["payload"] = vecPayload;
+    std::string strBody = j.dump();
+    Send(strBody.c_str());
+}
+
 void WebSocket::SendData_SubscribeRealtimeUpdates()
 {
 	nlohmann::json j;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp
@@ -343,6 +343,15 @@ class WebSocketMessage_NetworkSignal : public WebSocketMessageBase
 	NLOHMANN_DEFINE_TYPE_INTRUSIVE(WebSocketMessage_NetworkSignal, target_user_id, payload)
 };
 
+class WebSocketMessage_AnticheatMessage : public WebSocketMessageBase
+{
+public:
+    int64_t target_user_id = -1;
+    std::vector<uint8_t> payload;
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(WebSocketMessage_AnticheatMessage, target_user_id, payload)
+};
+
 class WebSocketMessage_ServerProbe : public WebSocketMessageBase
 {
 public:
@@ -1129,6 +1138,22 @@ void WebSocket::Tick()
 									}
 									break;
 
+                                    case EWebSocketMessageID::ANTICHEAT_MESSAGE:
+                                    {
+                                        NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] GOT AC MSG FROM WEBSOCKET!");
+
+										WebSocketMessage_AnticheatMessage acMsg;
+                                        bool bParsed = JSONGetAsObject(jsonObject, &acMsg);
+
+                                        if (bParsed)
+                                        {
+                                            NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] AC Msg Signal User: %lld!", acMsg.target_user_id);
+                                            NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] AC Msg Signal Payload Size: %d!", (int)acMsg.payload.size());
+                                            AnticheatPlugInterface::AC_NetworkMessageArrived(acMsg.target_user_id, acMsg.payload.data(), acMsg.payload.size());
+                                        }
+                                    }
+                                    break;
+
 									case EWebSocketMessageID::LOBBY_CURRENT_LOBBY_UPDATE:
 									{
 										// re-get the room info as it is stale
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/PluginInterfaces.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/PluginInterfaces.cpp
@@ -8,14 +8,15 @@
     AnticheatPlugInterface::Functions.fn##funcName = (FuncDef##funcName)GetProcAddress(g_hACPluginModule, #funcName); \
     if (!AnticheatPlugInterface::Functions.fn##funcName) \
     { \
-        NetworkLog(ELogVerbosity::LOG_RELEASE, "Failed to find " #funcName " function", MB_OK); \
+        NetworkLog(ELogVerbosity::LOG_RELEASE, "Failed to find " #funcName " function"); \
         FreeLibrary(g_hACPluginModule); \
+        g_hACPluginModule = nullptr; \
         return; \
     }
 
 bool AnticheatPlugInterface::IsExternalProcessRunning()
 {
-    if (IsPluginLoaded())
+    if (IsPluginLoaded() && Functions.fnIsExternalProcessRunning != nullptr)
     {
         return Functions.fnIsExternalProcessRunning();
     }
@@ -25,7 +26,7 @@ bool AnticheatPlugInterface::IsExternalProcessRunning()
 
 int AnticheatPlugInterface::GetAnticheatIdentifier()
 {
-    if (IsPluginLoaded())
+    if (IsPluginLoaded() && Functions.fnGetAnticheatIdentifier != nullptr)
     {
         return Functions.fnGetAnticheatIdentifier();
     }
@@ -35,6 +36,13 @@ int AnticheatPlugInterface::GetAnticheatIdentifier()
 
 void AnticheatPlugInterface::LoadPlugin(const char* szPluginName)
 {
+    if (szPluginName == nullptr)
+    {
+        NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] ERROR: Plugin name is null");
+        m_bPluginLoadFailed = true;
+        return;
+    }
+
     NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] Attempting to load plugin from %s", szPluginName);
 
     m_bPluginLoadFailed = false;
@@ -71,7 +79,10 @@ void AnticheatPlugInterface::LoadPlugin(const char* szPluginName)
         AC_PLUGIN_LOAD_FUNCTION(GetAnticheatIdentifier);
 
 #if _DEBUG
-        SetWindowText(ApplicationHWnd, Functions.fnIsExternalProcessRunning() ? "SECURED" : "INSECURE");
+        if (ApplicationHWnd != nullptr)
+        {
+            SetWindowText(ApplicationHWnd, Functions.fnIsExternalProcessRunning() ? "SECURED" : "INSECURE");
+        }
 #endif
 
         // integrity callback
@@ -111,7 +122,8 @@ void AnticheatPlugInterface::LoadPlugin(const char* szPluginName)
                 }
 
                 // If it's us, leave, if its someone else, d/c them
-                if (pAuthInterface->GetUserID() == userID)
+                uint32_t localUserID = pAuthInterface->GetUserID();
+                if (localUserID == userID)
                 {
                     NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] Leaving lobby, lobby isn't secure, action was requested against local user.");
                     g_bPendingExitLobby = true;
@@ -144,14 +156,45 @@ void AnticheatPlugInterface::LoadPlugin(const char* szPluginName)
                     return;
                 }
 
-                NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetNetworkMesh();
-                if (pMesh != nullptr)
+                // prefer websocket if we have it, otherwise fall back to p2p mesh
+                bool bFallbackToP2P = false;
+                std::shared_ptr<WebSocket>  pWS = NGMP_OnlineServicesManager::GetWebSocket();
+                if (pWS != nullptr)
                 {
-                    pMesh->SendACPacket(goUserID, pData, dataLen);
+                    if (pWS->IsConnected())
+                    {
+                        if (dataLen > 0)
+                        {
+                            std::vector<uint8_t> vecPayload((uint8_t*)pData, (uint8_t*)pData + dataLen);
+                            pWS->SendData_ACMessage(goUserID, vecPayload);
+                        }
+                        else
+                        {
+                            bFallbackToP2P = true;
+                        }
+                    }
+                    else
+                    {
+                        bFallbackToP2P = true;
+                    }
                 }
                 else
                 {
-                    NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] ERROR: Cannot send AC packet - NetworkMesh is null");
+                    bFallbackToP2P = true;
+                }
+
+                if (bFallbackToP2P)
+                {
+                    NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] AC Packets - WebSocket unavailable, falling back to P2P");
+                    NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetNetworkMesh();
+                    if (pMesh != nullptr)
+                    {
+                        pMesh->SendACPacket(goUserID, pData, dataLen);
+                    }
+                    else
+                    {
+                        NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] ERROR: Cannot send AC packet - NetworkMesh is null");
+                    }
                 }
             });
 
@@ -206,7 +249,8 @@ void AnticheatPlugInterface::Authenticate()
             return;
         }
 
-        Functions.fnLogin(pAuthInterface->GetAuthToken().c_str(),
+        std::string authToken = pAuthInterface->GetAuthToken();
+        Functions.fnLogin(authToken.c_str(),
             [](bool bSuccess)
             {
                 if (!bSuccess)
@@ -226,12 +270,14 @@ void AnticheatPlugInterface::Authenticate()
 
                         // Now we can begin login
                         NGMP_OnlineServices_AuthInterface* pAuthInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_AuthInterface>();
-                        if (pAuthInterface == nullptr)
+                        if (pAuthInterface != nullptr)
                         {
-                            return;
+                            pAuthInterface->SendMiddlewareToken(std::string(buf));
+                        }
+                        else
+                        {
+                            NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] ERROR: Auth interface became null during login callback");
                         }
-
-                        pAuthInterface->SendMiddlewareToken(std::string(buf));
                     }
                 }
                 else
@@ -289,7 +335,7 @@ bool AnticheatPlugInterface::RegisterPlayer(std::string mwUserID, uint32_t goUse
 
     if (IsPluginLoaded() && Functions.fnRegisterPlayer != nullptr)
     {
-        NetworkLog(ELogVerbosity::LOG_RELEASE, "RegisterPlayer: %s to %" PRIu64, mwUserID.c_str(), goUserID);
+        NetworkLog(ELogVerbosity::LOG_RELEASE, "RegisterPlayer: %s to %" PRIu32, mwUserID.c_str(), goUserID);
 
         bool bReg = Functions.fnRegisterPlayer(mwUserID.c_str(), goUserID);
         NetworkLog(ELogVerbosity::LOG_RELEASE, "RegisterPlayerFunc result: %d", bReg);
@@ -304,7 +350,7 @@ bool AnticheatPlugInterface::DeregisterPlayer(std::string mwUserID, uint32_t goU
 {
     if (IsPluginLoaded() && Functions.fnDeregisterPlayer != nullptr)
     {
-        NetworkLog(ELogVerbosity::LOG_RELEASE, "DeregisterPlayer: %s to %" PRIu64, mwUserID.c_str(), goUserID);
+        NetworkLog(ELogVerbosity::LOG_RELEASE, "DeregisterPlayer: %s to %" PRIu32, mwUserID.c_str(), goUserID);
 
         bool bReg = Functions.fnDeregisterPlayer(mwUserID.c_str(), goUserID);
         NetworkLog(ELogVerbosity::LOG_RELEASE, "DeregisterPlayerFunc result: %d", bReg);
@@ -346,12 +392,14 @@ void AnticheatPlugInterface::RefreshToken()
 
         m_tokenCreationTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::utc_clock::now().time_since_epoch()).count();
 
-        Functions.fnRefreshToken(pAuthInterface->GetAuthToken().c_str(),
+        std::string authToken = pAuthInterface->GetAuthToken();
+        Functions.fnRefreshToken(authToken.c_str(),
             [](bool bSuccess)
             {
                 NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] Refreshed token: %d", bSuccess);
                 if (!bSuccess)
                 {
+                    NetworkLog(ELogVerbosity::LOG_RELEASE, "[AC] ERROR: Token refresh failed");
                     // TODO_AC: Handle this, its a fatal error
                     return;
                 }
