aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #959 from poixen/server_command_limit

Browse source 
Server was using message limit for commands
This commit is contained in:
poixen 2015-04-13 00:32:25 +02:00
commit a2f416bb51
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/server_protocolhandler.cpp
View file

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

4
servatrice/servatrice.ini.example
View file

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

2
servatrice/src/servatrice.cpp
View file

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