Move from client packets limiter related code into separate file.

1 files changed, 3 insertions, 226 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 081fe3996..86369030a 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -91,6 +91,7 @@
 #include "net/loginhandler.h"
 #include "net/net.h"
 #include "net/netconsts.h"
+#include "net/packetlimiter.h"
 #include "net/partyhandler.h"
 
 #include "particle/particle.h"
@@ -328,7 +329,7 @@ void Client::gameInit()
     }
     atexit(SDL_Quit);
 
-    initPacketLimiter();
+    PacketLimiter::initPacketLimiter();
 #ifndef USE_SDL2
     SDL_EnableUNICODE(1);
 #endif
@@ -853,7 +854,7 @@ int Client::gameExec()
         {
             settings.serverName = mCurrentServer.hostname;
             ConfigManager::initServerConfig(mCurrentServer.hostname);
-            initPacketLimiter();
+            PacketLimiter::initPacketLimiter();
             initTradeFilter();
             Dirs::initUsersDir();
             player_relations.init();
@@ -1749,230 +1750,6 @@ void Client::initTradeFilter() const
     }
 }
 
-void Client::initPacketLimiter()
-{
-    // here i setting packet limits. but current server is broken,
-    // and this limits may not help.
-
-    mPacketLimits[PACKET_CHAT].timeLimit = 10 + 5;
-    mPacketLimits[PACKET_CHAT].lastTime = 0;
-    mPacketLimits[PACKET_CHAT].cntLimit = 1;
-    mPacketLimits[PACKET_CHAT].cnt = 0;
-
-    // 10
-    mPacketLimits[PACKET_PICKUP].timeLimit = 10 + 5;
-    mPacketLimits[PACKET_PICKUP].lastTime = 0;
-    mPacketLimits[PACKET_PICKUP].cntLimit = 1;
-    mPacketLimits[PACKET_PICKUP].cnt = 0;
-
-    // 10 5
-    mPacketLimits[PACKET_DROP].timeLimit = 5;
-    mPacketLimits[PACKET_DROP].lastTime = 0;
-    mPacketLimits[PACKET_DROP].cntLimit = 1;
-    mPacketLimits[PACKET_DROP].cnt = 0;
-
-    // 100
-    mPacketLimits[PACKET_NPC_NEXT].timeLimit = 0;
-    mPacketLimits[PACKET_NPC_NEXT].lastTime = 0;
-    mPacketLimits[PACKET_NPC_NEXT].cntLimit = 1;
-    mPacketLimits[PACKET_NPC_NEXT].cnt = 0;
-
-    mPacketLimits[PACKET_NPC_INPUT].timeLimit = 100;
-    mPacketLimits[PACKET_NPC_INPUT].lastTime = 0;
-    mPacketLimits[PACKET_NPC_INPUT].cntLimit = 1;
-    mPacketLimits[PACKET_NPC_INPUT].cnt = 0;
-
-    // 50
-    mPacketLimits[PACKET_NPC_TALK].timeLimit = 60;
-    mPacketLimits[PACKET_NPC_TALK].lastTime = 0;
-    mPacketLimits[PACKET_NPC_TALK].cntLimit = 1;
-    mPacketLimits[PACKET_NPC_TALK].cnt = 0;
-
-    // 10
-    mPacketLimits[PACKET_EMOTE].timeLimit = 10 + 5;
-    mPacketLimits[PACKET_EMOTE].lastTime = 0;
-    mPacketLimits[PACKET_EMOTE].cntLimit = 1;
-    mPacketLimits[PACKET_EMOTE].cnt = 0;
-
-    // 100
-    mPacketLimits[PACKET_SIT].timeLimit = 100;
-    mPacketLimits[PACKET_SIT].lastTime = 0;
-    mPacketLimits[PACKET_SIT].cntLimit = 1;
-    mPacketLimits[PACKET_SIT].cnt = 0;
-
-    mPacketLimits[PACKET_DIRECTION].timeLimit = 50;
-    mPacketLimits[PACKET_DIRECTION].lastTime = 0;
-    mPacketLimits[PACKET_DIRECTION].cntLimit = 1;
-    mPacketLimits[PACKET_DIRECTION].cnt = 0;
-
-    // 2+
-    mPacketLimits[PACKET_ATTACK].timeLimit = 2 + 10;
-    mPacketLimits[PACKET_ATTACK].lastTime = 0;
-    mPacketLimits[PACKET_ATTACK].cntLimit = 1;
-    mPacketLimits[PACKET_ATTACK].cnt = 0;
-
-    mPacketLimits[PACKET_STOPATTACK].timeLimit = 2 + 10;
-    mPacketLimits[PACKET_STOPATTACK].lastTime = 0;
-    mPacketLimits[PACKET_STOPATTACK].cntLimit = 1;
-    mPacketLimits[PACKET_STOPATTACK].cnt = 0;
-
-    mPacketLimits[PACKET_ONLINELIST].timeLimit = 1800;
-    mPacketLimits[PACKET_ONLINELIST].lastTime = 0;
-    mPacketLimits[PACKET_ONLINELIST].cntLimit = 1;
-    mPacketLimits[PACKET_ONLINELIST].cnt = 0;
-
-    // 300ms + 50 fix
-    mPacketLimits[PACKET_WHISPER].timeLimit = 30 + 5;
-    mPacketLimits[PACKET_WHISPER].lastTime = 0;
-    mPacketLimits[PACKET_WHISPER].cntLimit = 1;
-    mPacketLimits[PACKET_WHISPER].cnt = 0;
-
-    if (!settings.serverConfigDir.empty())
-    {
-        const std::string packetLimitsName = settings.serverConfigDir
-            + "/packetlimiter.txt";
-
-        std::ifstream inPacketFile;
-        struct stat statbuf;
-
-        if (stat(packetLimitsName.c_str(), &statbuf)
-            || !S_ISREG(statbuf.st_mode))
-        {
-            // wtiting new file
-            writePacketLimits(packetLimitsName);
-        }
-        else
-        {   // reading existent file
-            inPacketFile.open(packetLimitsName.c_str(), std::ios::in);
-            char line[101];
-
-            if (!inPacketFile.is_open() || !inPacketFile.getline(line, 100))
-            {
-                inPacketFile.close();
-                return;
-            }
-
-            const int ver = atoi(line);
-
-            for (int f = 0; f < PACKET_SIZE; f ++)
-            {
-                if (!inPacketFile.getline(line, 100))
-                    break;
-
-                if (!(ver == 1 && (f == PACKET_DROP || f == PACKET_NPC_NEXT)))
-                    mPacketLimits[f].timeLimit = atoi(line);
-            }
-            inPacketFile.close();
-            if (ver < 5)
-                writePacketLimits(packetLimitsName);
-        }
-    }
-}
-
-void Client::writePacketLimits(const std::string &packetLimitsName) const
-{
-    std::ofstream outPacketFile;
-    outPacketFile.open(packetLimitsName.c_str(), std::ios::out);
-    if (!outPacketFile.is_open())
-    {
-        outPacketFile.close();
-        return;
-    }
-    outPacketFile << "4" << std::endl;
-    for (int f = 0; f < PACKET_SIZE; f ++)
-    {
-        outPacketFile << toString(mPacketLimits[f].timeLimit)
-                      << std::endl;
-    }
-
-    outPacketFile.close();
-}
-
-bool Client::checkPackets(const int type) const
-{
-    if (type > PACKET_SIZE)
-        return false;
-
-    if (!serverConfig.getValueBool("enableBuggyServers", true))
-        return true;
-
-    const PacketLimit &limit = mPacketLimits[type];
-    const int timeLimit = limit.timeLimit;
-
-    if (!timeLimit)
-        return true;
-
-    const int time = tick_time;
-    const int lastTime = limit.lastTime;
-    const int cnt = limit.cnt;
-    const int cntLimit = limit.cntLimit;
-
-    if (lastTime > tick_time)
-    {
-//        instance()->mPacketLimits[type].lastTime = time;
-//        instance()->mPacketLimits[type].cnt = 0;
-
-        return true;
-    }
-    else if (lastTime + timeLimit > time)
-    {
-        if (cnt >= cntLimit)
-        {
-            return false;
-        }
-        else
-        {
-//            instance()->mPacketLimits[type].cnt ++;
-            return true;
-        }
-    }
-//    instance()->mPacketLimits[type].lastTime = time;
-//    instance()->mPacketLimits[type].cnt = 1;
-    return true;
-}
-
-bool Client::limitPackets(const int type)
-{
-    if (type < 0 || type > PACKET_SIZE)
-        return false;
-
-    if (!serverConfig.getValueBool("enableBuggyServers", true))
-        return true;
-
-    PacketLimit &pack = mPacketLimits[type];
-    const int timeLimit = pack.timeLimit;
-
-    if (!timeLimit)
-        return true;
-
-    const int time = tick_time;
-    const int lastTime = pack.lastTime;
-    const int cnt = pack.cnt;
-    const int cntLimit = pack.cntLimit;
-
-    if (lastTime > tick_time)
-    {
-        pack.lastTime = time;
-        pack.cnt = 0;
-        return true;
-    }
-    else if (lastTime + timeLimit > time)
-    {
-        if (cnt >= cntLimit)
-        {
-            return false;
-        }
-        else
-        {
-            pack.cnt ++;
-            return true;
-        }
-    }
-    pack.lastTime = time;
-    pack.cnt = 1;
-    return true;
-}
-
 void Client::setFramerate(const int fpsLimit) const
 {
     if (!fpsLimit)