Add fine-grained command flood controls

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 8835070580feb05c6bc21f8959cbd3a425b01193..86f801d3e3c3e4023d7f25d2f66235679ede9069 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -252,7 +252,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        if (IS_LOCAL(user) && !user->HasPrivPermission("users/flood/no-throttle"))
        {
                // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
-               IS_LOCAL(user)->Penalty += cm != cmdlist.end() ? cm->second->Penalty : 2;
+               IS_LOCAL(user)->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000;
        }
 
 
@@ -412,8 +412,8 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
        if (!user || buffer.empty())
                return true;
 
-       ServerInstance->Logs->Log("USERINPUT", DEBUG, "C[%d] I :%s %s", 
-               user->GetFd(), user->nick.c_str(), buffer.c_str());
+       ServerInstance->Logs->Log("USERINPUT", DEBUG, "C[%s] I :%s %s",
+               user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
        return ProcessCommand(user,buffer);
 }
 
@@ -428,7 +428,7 @@ bool CommandParser::AddCommand(Command *f)
        return false;
 }
 
-CommandParser::CommandParser() 
+CommandParser::CommandParser()
 {
        para.resize(128);
 }