- Log which HTTP protocol we are using to communicate with GO services

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h

@@ -47,6 +47,16 @@ class HTTPManager
 		return m_bCACertBad.load();
 	}
 
+    void SetProtocolInUse(EIPProtocolVersion proto)
+    {
+		m_sProtocolInUse.store(proto);
+    }
+
+	EIPProtocolVersion GetProtocolInUse()
+    {
+        return m_sProtocolInUse.load();
+    }
+
 	void AddHandleToMulti(CURL* pNewHandle);
 	void RemoveHandleFromMulti(CURL* pHandleToRemove);
 
@@ -71,6 +81,8 @@ class HTTPManager
 private:
 	CURLM* m_pCurl = nullptr;
 
+	std::atomic<EIPProtocolVersion> m_sProtocolInUse = EIPProtocolVersion::DONT_CARE;
+
 	static std::atomic<bool> m_bCACertBad;
 
 	bool m_bProxyEnabled = false;

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/HTTP/HTTPRequest.cpp

@@ -150,13 +150,41 @@ bool HTTPRequest::InvokeDelayAction()
 
 void HTTPRequest::Threaded_SetComplete(CURLcode result)
 {
-	if (result == CURLE_SSL_CACERT_BADFILE || CURLE_PEER_FAILED_VERIFICATION)
+	if (result == CURLE_SSL_CACERT_BADFILE || result == CURLE_PEER_FAILED_VERIFICATION)
 	{
 		HTTPManager::SetCACertStoreBad();
 	}
 	// store response code
 	curl_easy_getinfo(m_pCURL, CURLINFO_RESPONSE_CODE, &m_responseCode);
 
+	if (result == CURLE_OK)
+	{
+		HTTPManager* pHTTPManager = static_cast<HTTPManager*>(NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager());
+		if (pHTTPManager != nullptr)
+		{
+            if (pHTTPManager->GetProtocolInUse() == EIPProtocolVersion::DONT_CARE)
+			{
+                char* ip = nullptr;
+                curl_easy_getinfo(m_pCURL, CURLINFO_PRIMARY_IP, &ip);
+
+                if (ip)
+                {
+                    std::string addr(ip);
+                    if (addr.find(':') != std::string::npos)
+                    {
+						pHTTPManager->SetProtocolInUse(EIPProtocolVersion::FORCE_IPV6);
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "[HTTP] We are connected to GO services using IPv6");
+                    }
+                    else
+                    {
+						pHTTPManager->SetProtocolInUse(EIPProtocolVersion::FORCE_IPV4);
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "[HTTP] We are connected to GO services using IPv4");
+                    }
+                }
+			}
+		}
+	}
+
 	m_bIsComplete = true;
 
 	// finalize the size, so we can use .size etc

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

@@ -998,7 +998,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@032926_QFE3");
+	sentry_options_set_release(options, "generalsonline-client@032926_QFE5");
 
 #if defined(USE_TEST_ENV)
 	sentry_options_set_environment(options, "test");