Core/PacketIO: Prevented excessive WhoOpcode spam - solves possible crash/lag method

daniik · daniik · commit b35f831f2b38 · 2012-01-06T19:36:17.000+01:00
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -169,6 +169,11 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_WHO Message");
 
+    time_t now = time(NULL);
+    if (now - timeLastWhoCommand < 5)
+        return;
+    else timeLastWhoCommand = now;
+
     uint32 matchcount = 0;
 
     uint32 level_min, level_max, racemask, classmask, zones_count, str_count;
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
@@ -94,7 +94,7 @@ m_playerRecentlyLogout(false), m_playerSave(false),
 m_sessionDbcLocale(sWorld->GetAvailableDbcLocale(locale)),
 m_sessionDbLocaleIndex(locale),
 m_latency(0), m_TutorialsChanged(false), recruiterId(recruiter),
-isRecruiter(isARecruiter)
+isRecruiter(isARecruiter), timeLastWhoCommand(0)
 {
     if (sock)
     {
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
@@ -949,6 +949,7 @@ class WorldSession
         uint32 recruiterId;
         bool isRecruiter;
         ACE_Based::LockedQueue<WorldPacket*, ACE_Thread_Mutex> _recvQueue;
+        time_t timeLastWhoCommand;
 };
 #endif
 /// @}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ m_playerRecentlyLogout(false), m_playerSave(false),`
`94`	`94`	`m_sessionDbcLocale(sWorld->GetAvailableDbcLocale(locale)),`
`95`	`95`	`m_sessionDbLocaleIndex(locale),`
`96`	`96`	`m_latency(0), m_TutorialsChanged(false), recruiterId(recruiter),`
`97`		`-isRecruiter(isARecruiter)`
	`97`	`+isRecruiter(isARecruiter), timeLastWhoCommand(0)`
`98`	`98`	`{`
`99`	`99`	`if (sock)`
`100`	`100`	`{`