Added optional queue name argument to client fetchRemote

ccw808 · ccw808 · commit 1bae73a8bbd4 · 2017-04-06T17:14:50.000+01:00
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -1179,8 +1179,7 @@ void CClientGame::DoPulses ( void )
         // Pulse DownloadFiles if we're transferring stuff
         GetResourceFileDownloadManager()->DoPulse();
         DownloadSingularResourceFiles ();
-        g_pNet->GetHTTPDownloadManager ( EDownloadMode::CALL_REMOTE )->ProcessQueuedFiles ();
-        g_pNet->GetHTTPDownloadManager(EDownloadMode::CALL_REMOTE_ANY_HOST)->ProcessQueuedFiles();
+        GetRemoteCalls()->ProcessQueuedFiles();
     }
 
     // Not waiting for local connect?
diff --git a/Client/mods/deathmatch/logic/CRemoteCalls.cpp b/Client/mods/deathmatch/logic/CRemoteCalls.cpp
@@ -31,21 +31,21 @@ CRemoteCalls::~CRemoteCalls()
 }
 
 
-void CRemoteCalls::Call ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+void CRemoteCalls::Call ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
 {
-    m_calls.push_back ( new CRemoteCall ( szServerHost, szResourceName, szFunctionName, arguments, luaMain, iFunction, uiConnectionAttempts, uiConnectTimeoutMs ) );
+    m_calls.push_back ( new CRemoteCall ( szServerHost, szResourceName, szFunctionName, arguments, luaMain, iFunction, strQueueName, uiConnectionAttempts, uiConnectTimeoutMs ) );
     m_calls.back ()->MakeCall ();
 }
 
-void CRemoteCalls::Call ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+void CRemoteCalls::Call ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
 {
-    m_calls.push_back ( new CRemoteCall ( szURL, arguments, luaMain, iFunction, uiConnectionAttempts, uiConnectTimeoutMs ) );
+    m_calls.push_back ( new CRemoteCall ( szURL, arguments, luaMain, iFunction, strQueueName, uiConnectionAttempts, uiConnectTimeoutMs ) );
     m_calls.back ()->MakeCall ();
 }
 
-void CRemoteCalls::Call ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+void CRemoteCalls::Call ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
 {
-    m_calls.push_back ( new CRemoteCall ( szURL, fetchArguments, strPostData, bPostBinary, luaMain, iFunction, uiConnectionAttempts, uiConnectTimeoutMs ) );
+    m_calls.push_back ( new CRemoteCall ( szURL, fetchArguments, strPostData, bPostBinary, luaMain, iFunction, strQueueName, uiConnectionAttempts, uiConnectTimeoutMs ) );
     m_calls.back ()->MakeCall ();
 }
 
@@ -86,9 +86,60 @@ bool CRemoteCalls::CallExists ( CRemoteCall * call )
     return false;
 }
 
+// Map queue index into download manager id
+EDownloadModeType CRemoteCalls::GetDownloadModeFromQueueIndex( uint uiIndex, bool bAnyHost )
+{
+    uiIndex %= MAX_CALL_REMOTE_QUEUES;
+    uiIndex += bAnyHost ? EDownloadMode::CALL_REMOTE_ANY_HOST : EDownloadMode::CALL_REMOTE_RESTRICTED;
+    return (EDownloadModeType)uiIndex;
+}
+
+// Map queue name to download manager id
+EDownloadModeType CRemoteCalls::GetDownloadModeForQueueName( const SString& strQueueName, bool bAnyHost )
+{
+    uint* pIndex = MapFind( m_QueueIndexMap, strQueueName );
+    if ( pIndex )
+    {
+        return GetDownloadModeFromQueueIndex( *pIndex, bAnyHost );
+    }
+    else
+    {
+        // Find lowest unused index
+        uint idx = 0;
+        while( MapContainsValue( m_QueueIndexMap, idx ) )
+        {
+            idx++;
+        }
+        // Add new mapping
+        MapSet( m_QueueIndexMap, strQueueName, idx );
+        return GetDownloadModeFromQueueIndex( idx, bAnyHost );
+    }
+}
+
+
+void CRemoteCalls::ProcessQueuedFiles( void )
+{
+    for ( auto iter = m_QueueIndexMap.cbegin(); iter != m_QueueIndexMap.cend(); )
+    {
+        EDownloadModeType downloadMode = GetDownloadModeFromQueueIndex( iter->second, false );
+        EDownloadModeType downloadModeAnyIp = GetDownloadModeFromQueueIndex( iter->second, true );
+        if ( g_pNet->GetHTTPDownloadManager( downloadMode )->ProcessQueuedFiles()
+          && g_pNet->GetHTTPDownloadManager( downloadModeAnyIp )->ProcessQueuedFiles() )
+        {
+            // Queue empty, so remove name mapping if not default queue
+            if ( iter->first != CALL_REMOTE_DEFAULT_QUEUE_NAME )
+            {
+                iter = m_QueueIndexMap.erase( iter );
+                continue;
+            }
+        }
+        ++iter;
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
-CRemoteCall::CRemoteCall ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+CRemoteCall::CRemoteCall ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
 {
     m_VM = luaMain;
     m_iFunction = iFunction;
@@ -98,12 +149,13 @@ CRemoteCall::CRemoteCall ( const char * szServerHost, const char * szResourceNam
     m_bIsFetch = false;
 
     m_strURL = SString ( "http://%s/%s/call/%s", szServerHost, szResourceName, szFunctionName );
+    m_strQueueName = strQueueName;
     m_uiConnectionAttempts = uiConnectionAttempts;
     m_uiConnectTimeoutMs = uiConnectTimeoutMs;
 }
 
 //arbitary URL version
-CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
 {
     m_VM = luaMain;
     m_iFunction = iFunction;
@@ -113,12 +165,13 @@ CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * arguments, CLuaMa
     m_bIsFetch = false;
 
     m_strURL = szURL;
+    m_strQueueName = strQueueName;
     m_uiConnectionAttempts = uiConnectionAttempts;
     m_uiConnectTimeoutMs = uiConnectTimeoutMs;
 }
 
 //Fetch version
-CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
+CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs )
     : m_FetchArguments ( *fetchArguments )
 {
     m_VM = luaMain;
@@ -129,6 +182,7 @@ CRemoteCall::CRemoteCall ( const char * szURL, CLuaArguments * fetchArguments, c
     m_bIsFetch = true;
 
     m_strURL = szURL;
+    m_strQueueName = strQueueName;
     m_uiConnectionAttempts = uiConnectionAttempts;
     m_uiConnectTimeoutMs = uiConnectTimeoutMs;
 }
@@ -140,18 +194,11 @@ CRemoteCall::~CRemoteCall ()
 
 void CRemoteCall::MakeCall()
 {
-    if (g_pCore->GetWebCore()->GetDomainState(g_pCore->GetWebCore()->GetDomainFromURL(m_strURL)) == eURLState::WEBPAGE_ALLOWED)
-    {
-        // Bypass IP check if we are allowed to access the URL
-        CNetHTTPDownloadManagerInterface* pDownloadManager = g_pNet->GetHTTPDownloadManager(EDownloadMode::CALL_REMOTE_ANY_HOST);
-        pDownloadManager->QueueFile(m_strURL, NULL, 0, m_strData.c_str(), m_strData.length(), m_bPostBinary, this, DownloadFinishedCallback, false, m_uiConnectionAttempts, m_uiConnectTimeoutMs);
-    }
-    else
-    {
-        // Proceed with the normal way (IP check in net module)
-        CNetHTTPDownloadManagerInterface* pDownloadManager = g_pNet->GetHTTPDownloadManager(EDownloadMode::CALL_REMOTE);
-        pDownloadManager->QueueFile(m_strURL, NULL, 0, m_strData.c_str(), m_strData.length(), m_bPostBinary, this, DownloadFinishedCallback, false, m_uiConnectionAttempts, m_uiConnectTimeoutMs);
-    }
+    // Bypass net module IP check if we are allowed to access the URL
+    bool bAnyHost = (g_pCore->GetWebCore()->GetDomainState(g_pCore->GetWebCore()->GetDomainFromURL(m_strURL)) == eURLState::WEBPAGE_ALLOWED);
+    EDownloadModeType downloadMode = g_pClientGame->GetRemoteCalls()->GetDownloadModeForQueueName(m_strQueueName, bAnyHost);
+    CNetHTTPDownloadManagerInterface* pDownloadManager = g_pNet->GetHTTPDownloadManager(downloadMode);
+    pDownloadManager->QueueFile(m_strURL, NULL, 0, m_strData.c_str(), m_strData.length(), m_bPostBinary, this, DownloadFinishedCallback, false, m_uiConnectionAttempts, m_uiConnectTimeoutMs);
 }
 
 void CRemoteCall::DownloadFinishedCallback( char * data, size_t dataLength, void * obj, bool bSuccess, int iErrorCode )
diff --git a/Client/mods/deathmatch/logic/CRemoteCalls.h b/Client/mods/deathmatch/logic/CRemoteCalls.h
@@ -13,6 +13,8 @@
 #ifndef __CREMOTECALLS_H
 #define __CREMOTECALLS_H
 #include "lua/CLuaArguments.h"
+#define CALL_REMOTE_DEFAULT_QUEUE_NAME  "default"
+
 /*
 This represents a single live remote call. Calls are live until the call returns 
 i.e. the http client has downloaded all the data returned
@@ -26,14 +28,15 @@ class CRemoteCall
     class CLuaMain *    m_VM;
     CLuaFunctionRef     m_iFunction;
     SString             m_strURL;
+    SString             m_strQueueName;
     uint                m_uiConnectionAttempts;
     uint                m_uiConnectTimeoutMs;
     CLuaArguments       m_FetchArguments;
 
 public:
-                        CRemoteCall ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
-                        CRemoteCall ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
-                        CRemoteCall ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+                        CRemoteCall ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+                        CRemoteCall ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+                        CRemoteCall ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
                         ~CRemoteCall ();
     void                MakeCall();
     static void         DownloadFinishedCallback( char * data, size_t dataLength, void * obj, bool bSuccess, int iErrorCode );
@@ -51,15 +54,19 @@ class CRemoteCalls
 {
 private:
     std::list<CRemoteCall*> m_calls;
+    std::map<SString,uint> m_QueueIndexMap;
 public:
                         CRemoteCalls();
                         ~CRemoteCalls();
 
-    void                Call ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
-    void                Call ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
-    void                Call ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+    void                Call ( const char * szServerHost, const char * szResourceName, const char * szFunctionName, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+    void                Call ( const char * szURL, CLuaArguments * arguments, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
+    void                Call ( const char * szURL, CLuaArguments * fetchArguments, const SString& strPostData, bool bPostBinary, CLuaMain * luaMain, const CLuaFunctionRef& iFunction, const SString& strQueueName, uint uiConnectionAttempts, uint uiConnectTimeoutMs );
     void                Remove ( CLuaMain * luaMain );
     void                Remove ( CRemoteCall * call );
     bool                CallExists ( CRemoteCall * call );
+    void                ProcessQueuedFiles ( void );
+    EDownloadModeType   GetDownloadModeForQueueName( const SString& strQueueName, bool bAnyHost );
+    EDownloadModeType   GetDownloadModeFromQueueIndex( uint uiIndex, bool bAnyHost );
 };
 #endif
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.World.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.World.cpp
@@ -19,6 +19,7 @@
 
 #include "StdInc.h"
 
+#define MIN_CLIENT_REQ_CALLREMOTE_QUEUE_NAME                "1.5.3-9.11270"
 #define MIN_CLIENT_REQ_FETCHREMOTE_CONNECT_TIMEOUT          "1.3.5"
 
 int CLuaFunctionDefs::CreateExplosion ( lua_State* luaVM )
@@ -1839,11 +1840,14 @@ int CLuaFunctionDefs::GetFPSLimit ( lua_State* luaVM )
 // Call a function on a remote server
 int CLuaFunctionDefs::FetchRemote ( lua_State* luaVM )
 {
-//  bool fetchRemote ( string URL [, int connectionAttempts = 10, int connectTimeout = 10000 ], callback callbackFunction, [ string postData, bool bPostBinary, arguments... ] )
+//  bool fetchRemote ( string URL [, string queueName ][, int connectionAttempts = 10, int connectTimeout = 10000 ], callback callbackFunction, [ string postData, bool bPostBinary, arguments... ] )
     CScriptArgReader argStream ( luaVM );
-    SString strURL; CLuaFunctionRef iLuaFunction; SString strPostData; bool bPostBinary; CLuaArguments args; uint uiConnectionAttempts; uint uiConnectTimeoutMs;
+    SString strURL; SString strQueueName; CLuaFunctionRef iLuaFunction; SString strPostData; bool bPostBinary; CLuaArguments args; uint uiConnectionAttempts; uint uiConnectTimeoutMs;
 
     argStream.ReadString ( strURL );
+    if ( argStream.NextIsString () )
+        MinClientReqCheck ( argStream, MIN_CLIENT_REQ_CALLREMOTE_QUEUE_NAME, "'queue name' is being used" );
+    argStream.ReadIfNextIsString ( strQueueName, CALL_REMOTE_DEFAULT_QUEUE_NAME );
     argStream.ReadIfNextIsNumber ( uiConnectionAttempts, 10 );
     if ( argStream.NextIsNumber () )
         MinClientReqCheck ( argStream, MIN_CLIENT_REQ_FETCHREMOTE_CONNECT_TIMEOUT, "'connect timeout' is being used" );
@@ -1859,7 +1863,7 @@ int CLuaFunctionDefs::FetchRemote ( lua_State* luaVM )
         CLuaMain * luaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
         if ( luaMain )
         {
-            g_pClientGame->GetRemoteCalls()->Call ( strURL, &args, strPostData, bPostBinary, luaMain, iLuaFunction, uiConnectionAttempts, uiConnectTimeoutMs );
+            g_pClientGame->GetRemoteCalls()->Call ( strURL, &args, strPostData, bPostBinary, luaMain, iLuaFunction, strQueueName, uiConnectionAttempts, uiConnectTimeoutMs );
             lua_pushboolean ( luaVM, true );
             return 1;
         }
diff --git a/Client/sdk/net/CNet.h b/Client/sdk/net/CNet.h
@@ -17,20 +17,25 @@
 #include "net/bitstream.h"
 #include "CNetHTTPDownloadManagerInterface.h"
 
+#define MAX_CALL_REMOTE_QUEUES  100
+
 namespace EDownloadMode
 {
     enum EDownloadModeType
     {
         NONE,
         CORE_ASE_LIST,
         CORE_UPDATER,
+        WEBBROWSER_LISTS,
+        CORE_LAST,                      // Download modes after this one will be reset on server disconnect
         RESOURCE_INITIAL_FILES_INTERNAL,
         RESOURCE_INITIAL_FILES_EXTERNAL,
         RESOURCE_SINGULAR_FILES,
-        CALL_REMOTE,
-        WEBBROWSER_LISTS,
         CONNECT_TCP_SEND,
+        CALL_REMOTE_RESTRICTED,
+        CALL_REMOTE_RESTRICTED_LAST = CALL_REMOTE_RESTRICTED + MAX_CALL_REMOTE_QUEUES - 1,
         CALL_REMOTE_ANY_HOST,
+        CALL_REMOTE_ANY_HOST_LAST = CALL_REMOTE_ANY_HOST + MAX_CALL_REMOTE_QUEUES - 1,
     };
 }
 using EDownloadMode::EDownloadModeType;
diff --git a/Client/version.h b/Client/version.h
@@ -75,7 +75,7 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _CLIENT_NET_MODULE_VERSION      0x0A1       // (0x000 - 0xfff) Lvl9 wizards only
+#define _CLIENT_NET_MODULE_VERSION      0x0A2       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
 #define MTA_DM_BITSTREAM_VERSION        0x06A       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 
diff --git a/Server/mods/deathmatch/logic/CRemoteCalls.cpp b/Server/mods/deathmatch/logic/CRemoteCalls.cpp
@@ -86,15 +86,15 @@ bool CRemoteCalls::CallExists ( CRemoteCall * call )
     return false;
 }
 
-// Map quene index into download manager id
+// Map queue index into download manager id
 EDownloadModeType CRemoteCalls::GetDownloadModeFromQueueIndex( uint uiIndex )
 {
-    uiIndex %= ( EDownloadMode::CALL_REMOTE_LAST - EDownloadMode::CALL_REMOTE_FIRST );
-    uiIndex += EDownloadMode::CALL_REMOTE_FIRST;
+    uiIndex %= MAX_CALL_REMOTE_QUEUES;
+    uiIndex += EDownloadMode::CALL_REMOTE;
     return (EDownloadModeType)uiIndex;
 }
 
-// Map quene name to download manager id
+// Map queue name to download manager id
 EDownloadModeType CRemoteCalls::GetDownloadModeForQueueName( const SString& strQueueName )
 {
     uint* pIndex = MapFind( m_QueueIndexMap, strQueueName );
diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Server.cpp b/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Server.cpp
@@ -21,7 +21,7 @@
 *****************************************************************************/
 
 #include "StdInc.h"
-#define MIN_SERVER_REQ_CALLREMOTE_QUEUE_NAME                "1.5.3-9.11269"
+#define MIN_SERVER_REQ_CALLREMOTE_QUEUE_NAME                "1.5.3-9.11270"
 #define MIN_SERVER_REQ_CALLREMOTE_CONNECTION_ATTEMPTS       "1.3.0-9.04563"
 #define MIN_SERVER_REQ_CALLREMOTE_CONNECT_TIMEOUT           "1.3.5"
 
diff --git a/Server/sdk/net/CNetServer.h b/Server/sdk/net/CNetServer.h
@@ -17,14 +17,16 @@
 #include "ns_playerid.h"
 #include "CNetHTTPDownloadManagerInterface.h"
 
+#define MAX_CALL_REMOTE_QUEUES  100
+
 namespace EDownloadMode
 {
     enum EDownloadModeType
     {
         NONE,
         ASE,
-        CALL_REMOTE_FIRST,
-        CALL_REMOTE_LAST = CALL_REMOTE_FIRST + 100,
+        CALL_REMOTE,
+        CALL_REMOTE_LAST = CALL_REMOTE + MAX_CALL_REMOTE_QUEUES - 1,
     };
 }
 using EDownloadMode::EDownloadModeType;
diff --git a/Server/version.h b/Server/version.h
@@ -78,7 +78,7 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _SERVER_NET_MODULE_VERSION      0x09E       // (0x000 - 0xfff) Lvl9 wizards only
+#define _SERVER_NET_MODULE_VERSION      0x0A2       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
 #define MTA_DM_BITSTREAM_VERSION        0x06A       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 

Original file line number	Diff line number	Diff line change
`@@ -1179,8 +1179,7 @@ void CClientGame::DoPulses ( void )`
`1179`	`1179`	`// Pulse DownloadFiles if we're transferring stuff`
`1180`	`1180`	`GetResourceFileDownloadManager()->DoPulse();`
`1181`	`1181`	`DownloadSingularResourceFiles ();`
`1182`		`- g_pNet->GetHTTPDownloadManager ( EDownloadMode::CALL_REMOTE )->ProcessQueuedFiles ();`
`1183`		`- g_pNet->GetHTTPDownloadManager(EDownloadMode::CALL_REMOTE_ANY_HOST)->ProcessQueuedFiles();`
	`1182`	`+ GetRemoteCalls()->ProcessQueuedFiles();`
`1184`	`1183`	`}`
`1185`	`1184`
`1186`	`1185`	`// Not waiting for local connect?`
Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ bool CRemoteCalls::CallExists ( CRemoteCall * call )`
`86`	`86`	`return false;`
`87`	`87`	`}`
`88`	`88`
`89`		`-// Map quene index into download manager id`
	`89`	`+// Map queue index into download manager id`
`90`	`90`	`EDownloadModeType CRemoteCalls::GetDownloadModeFromQueueIndex( uint uiIndex )`
`91`	`91`	`{`
`92`		`- uiIndex %= ( EDownloadMode::CALL_REMOTE_LAST - EDownloadMode::CALL_REMOTE_FIRST );`
`93`		`- uiIndex += EDownloadMode::CALL_REMOTE_FIRST;`
	`92`	`+ uiIndex %= MAX_CALL_REMOTE_QUEUES;`
	`93`	`+ uiIndex += EDownloadMode::CALL_REMOTE;`
`94`	`94`	`return (EDownloadModeType)uiIndex;`
`95`	`95`	`}`
`96`	`96`
`97`		`-// Map quene name to download manager id`
	`97`	`+// Map queue name to download manager id`
`98`	`98`	`EDownloadModeType CRemoteCalls::GetDownloadModeForQueueName( const SString& strQueueName )`
`99`	`99`	`{`
`100`	`100`	`uint* pIndex = MapFind( m_QueueIndexMap, strQueueName );`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,16 @@`
`17`	`17`	`#include "ns_playerid.h"`
`18`	`18`	`#include "CNetHTTPDownloadManagerInterface.h"`
`19`	`19`
	`20`	`+#define MAX_CALL_REMOTE_QUEUES 100`
	`21`	`+`
`20`	`22`	`namespace EDownloadMode`
`21`	`23`	`{`
`22`	`24`	`enum EDownloadModeType`
`23`	`25`	`{`
`24`	`26`	`NONE,`
`25`	`27`	`ASE,`
`26`		`- CALL_REMOTE_FIRST,`
`27`		`- CALL_REMOTE_LAST = CALL_REMOTE_FIRST + 100,`
	`28`	`+ CALL_REMOTE,`
	`29`	`+ CALL_REMOTE_LAST = CALL_REMOTE + MAX_CALL_REMOTE_QUEUES - 1,`
`28`	`30`	`};`
`29`	`31`	`}`
`30`	`32`	`using EDownloadMode::EDownloadModeType;`