Improved client connecting through firewalls

Author: ccw808

Client/core/CConnectManager.cpp

@@ -146,7 +146,7 @@ bool CConnectManager::Connect ( const char* szHost, unsigned short usPort, const
     m_pServerItem = new CServerListItem ( m_Address, m_usPort );
     m_pServerItem->m_iTimeoutLength = 2000;
     m_bIsDetectingVersion = true;
-    OpenServerFirewall( m_Address, 80, true );
+    OpenServerFirewall( m_Address, CServerBrowser::GetSingletonPtr()->FindServerHttpPort(m_strHost, m_usPort), true );
 
     // Display the status box
     SString strBuffer ( _("Connecting to %s:%u ..."), m_strHost.c_str(), m_usPort );
@@ -466,21 +466,29 @@ void CConnectManager::OnServerExists ( void )
 //
 void CConnectManager::OpenServerFirewall( in_addr Address, ushort usHttpPort, bool bHighPriority )
 {
-    if ( usHttpPort == 0 )
-        usHttpPort = 80;
-
     uint uiTimeOut;
     if ( bHighPriority )
     {
         // Clear previously queued requests if this is high priority
         g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->Reset();
+        g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->SetMaxConnections(2);
         uiTimeOut = 2000;
     }
     else
     {
         uiTimeOut = 1000;
     }
 
-    SString strDummyUrl( "http://%s:%d/mta_client_firewall_probe/", inet_ntoa( Address ), usHttpPort );
-    g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->QueueFile( strDummyUrl, NULL, "", 0, true, NULL, NULL, false, 1, uiTimeOut );
+    if ( usHttpPort )
+    {
+        // Send to server http port if known
+        SString strDummyUrl( "http://%s:%d/mta_client_firewall_probe/", inet_ntoa( Address ), usHttpPort );
+        g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->QueueFile( strDummyUrl, NULL, "", 0, true, NULL, NULL, false, 1, uiTimeOut );
+    }
+    if ( usHttpPort == 0 || bHighPriority )
+    {
+        // Send to standard http port
+        SString strDummyUrl( "http://%s/mta_client_firewall_probe/", inet_ntoa( Address ) );
+        g_pCore->GetNetwork()->GetHTTPDownloadManager( EDownloadMode::CONNECT_TCP_SEND )->QueueFile( strDummyUrl, NULL, "", 0, true, NULL, NULL, false, 1, uiTimeOut );
+    }
 }

Client/core/Serverbrowser/CServerBrowser.cpp

@@ -2043,7 +2043,7 @@ CServerListItem* CServerBrowser::FindServerFromRow ( ServerBrowserType Type, int
 // Finds a server at any point in the active list
 //
 /////////////////////////////////////////////////////////////////
-CServerListItem* CServerBrowser::FindServer ( std::string strHost, unsigned short usPort )
+CServerListItem* CServerBrowser::FindServer ( const std::string& strHost, unsigned short usPort )
 {
     ServerBrowserType Type = GetCurrentServerBrowserType ();
     CServerList * pList = GetServerList ( Type );
@@ -2060,6 +2060,26 @@ CServerListItem* CServerBrowser::FindServer ( std::string strHost, unsigned shor
 }
 
 
+/////////////////////////////////////////////////////////////////
+//
+// CServerBrowser::FindServerHttpPort
+//
+// Finds a server http port. Returns 0 if not found.
+//
+/////////////////////////////////////////////////////////////////
+unsigned short CServerBrowser::FindServerHttpPort ( const std::string& strHost, unsigned short usPort )
+{
+    CServerList * pList = GetServerList ( ServerBrowserTypes::INTERNET );
+    CServerListIterator i, i_b = pList->IteratorBegin (), i_e = pList->IteratorEnd (); 
+    for ( CServerListIterator i = i_b; i != i_e; i++ )
+    {
+        CServerListItem * pServer = *i;
+        if ( pServer->strHost == strHost && pServer->usGamePort == usPort )
+            return pServer->m_usHttpPort;
+    }
+    return 0;
+}
+
 
 /////////////////////////////////////////////////////////////////
 //

Client/core/Serverbrowser/CServerBrowser.h

@@ -102,7 +102,8 @@ class CServerBrowser : public CSingleton < CServerBrowser >
 
     CServerListItem*    FindSelectedServer      ( ServerBrowserType Type );
     CServerListItem*    FindServerFromRow       ( ServerBrowserType Type, int iRow );
-    CServerListItem*    FindServer              ( std::string strHost, unsigned short usPort );
+    CServerListItem*    FindServer              ( const std::string& strHost, unsigned short usPort );
+    unsigned short      FindServerHttpPort      ( const std::string& strHost, unsigned short usPort );
     int                 FindRowFromServer       ( ServerBrowserType Type, const CServerListItem * pServer );
     void                UpdateSelectedServerPlayerList ( ServerBrowserType Type );
     void                GetVisibleEndPointList  ( std::vector < SAddressPort >& outEndpointList );

Client/loader/MainFunctions.cpp

@@ -566,6 +566,7 @@ void HandleIfGTAIsAlreadyRunning( void )
     {
         if ( MessageBoxUTF8 ( 0, _("An instance of GTA: San Andreas is already running. It needs to be terminated before MTA:SA can be started. Do you want to do that now?"), _("Information")+_E("CL10"), MB_YESNO | MB_ICONQUESTION | MB_TOPMOST ) == IDYES )
         {
+            TerminateOtherMTAIfRunning();
             TerminateGTAIfRunning ();
             if ( IsGTARunning () )
             {

Client/loader/Utils.cpp

@@ -1390,11 +1390,26 @@ bool Is32bitProcess ( DWORD processID )
 ///////////////////////////////////////////////////////////////////////////
 void TerminateProcess( DWORD dwProcessID, uint uiExitCode )
 {
-    HANDLE hProcess = OpenProcess( PROCESS_TERMINATE, 0, dwProcessID );
-    if ( hProcess )
+    HMODULE hModule = GetLibraryHandle ( "kernel32.dll" );
+    if ( hModule )
     {
-        TerminateProcess( hProcess, uiExitCode );
-        CloseHandle( hProcess );
+        typedef bool (*PFNTerminateProcess) ( uint, uint );
+        PFNTerminateProcess pfnTerminateProcess = static_cast< PFNTerminateProcess > ( static_cast < PVOID > ( GetProcAddress ( hModule, "NtTerminateProcess" ) ) );
+
+        if ( pfnTerminateProcess )
+        {
+            bool bResult = pfnTerminateProcess ( dwProcessID, uiExitCode );
+            AddReportLog ( 8070, SString ( "TerminateProcess %d result: %d", dwProcessID, bResult ) );
+        }
+        else
+        {
+            HANDLE hProcess = OpenProcess( PROCESS_TERMINATE, 0, dwProcessID );
+            if ( hProcess )
+            {
+                TerminateProcess( hProcess, uiExitCode );
+                CloseHandle( hProcess );
+            }
+        }
     }
 }