Merge pull request #959 from poixen/server_command_limit

Server was using message limit for commands

common/server_protocolhandler.cpp

@@ -234,7 +234,7 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
         return Response::RespNotInRoom;
     
     int commandCountingInterval = server->getCommandCountingInterval();
-    int maxMessageCountPerInterval = server->getMaxMessageCountPerInterval();
+    int maxCommandCountPerInterval = server->getMaxCommandCountPerInterval();
     GameEventStorage ges;
     Response::ResponseCode finalResponseCode = Response::RespOk;
     for (int i = cont.game_command_size() - 1; i >= 0; --i) {
@@ -252,7 +252,7 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
             for (int i = 0; i < commandCountOverTime.size(); ++i)
                 totalCount += commandCountOverTime[i];
             
-            if (totalCount > maxMessageCountPerInterval)
+            if (totalCount > maxCommandCountPerInterval)
                 return Response::RespChatFlood;
         }
 

servatrice/servatrice.ini.example

@@ -147,8 +147,8 @@ max_games_per_user=5
 ; This setting defines the length in seconds of the considered interval; default is 10
 command_counting_interval=10
 
-; Maximum number of game commands in an interval before new commands gets dropped; default is 10
-max_command_count_per_interval=10
+; Maximum number of game commands in an interval before new commands gets dropped; default is 20
+max_command_count_per_interval=20
 
 [logging]
 

servatrice/src/servatrice.cpp

@@ -260,7 +260,7 @@ bool Servatrice::initServer()
     maxMessageSizePerInterval = settingsCache->value("security/max_message_size_per_interval", 1000).toInt();
     maxGamesPerUser = settingsCache->value("security/max_games_per_user", 5).toInt();
     commandCountingInterval = settingsCache->value("game/command_counting_interval", 10).toInt();
-    maxCommandCountPerInterval = settingsCache->value("game/max_command_count_per_interval", 10).toInt();
+    maxCommandCountPerInterval = settingsCache->value("game/max_command_count_per_interval", 20).toInt();
 
 	try { if (settingsCache->value("servernetwork/active", 0).toInt()) {
 		qDebug() << "Connecting to ISL network.";