]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Remove some debug
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 52e1d79929f68480fe6cd0511ef39e5727234f5a..259d636d326402891845f2de873fc738adfc14c4 100644 (file)
@@ -1,13 +1,10 @@
-/*       +------------------------------------+
+       /*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -41,12 +38,10 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
 {
        int MOD_RESULT = 0;
        FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
-       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
        if (MOD_RESULT == 1)
                return 0;
        if (MOD_RESULT == -1)
                return 1;
-       Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
        return strcmp(data,input);
 }
 
@@ -109,89 +104,6 @@ long InspIRCd::Duration(const char* str)
        return total;
 }
 
-/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
-
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
-{
-       char buffer[MAXBUF];
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
-               return false;
-       
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               strlcpy(buffer,u->second->ident,MAXBUF);
-               charlcat(buffer,'@',MAXBUF);
-               strlcat(buffer,u->second->host,MAXBUF);
-               if (match(buffer,mask.c_str()))
-                       matches++;
-       }
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
-               return true;
-       }
-       return false;
-}
-
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
-{
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
-               return false;
-       
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               if (match(u->second->GetIPString(),ip.c_str(),true))
-                       matches++;
-       }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
-               return true;
-       }
-       return false;
-}
-
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
-{
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
-               return false;
-
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               if (match(u->second->nick,nick.c_str()))
-                       matches++;
-       }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
-               return true;
-       }
-       return false;
-}
-
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
  * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
  * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
@@ -261,7 +173,6 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        std::map<irc::string, bool> dupes;
 
        /* Only one commasepstream here */
-       ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
        irc::commasepstream items1(parameters[splithere]);
        std::string item = "*";
        unsigned int max = 0;
@@ -455,28 +366,33 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       bool go_again = true;
-
-       while (go_again)
+       nspace::hash_map<std::string,command_t*>::iterator i,safei;
+       for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
-               go_again = false;
-
-               for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+               safei = i;
+               safei++;
+               if (safei != cmdlist.end())
                {
-                       command_t* x = i->second;
-                       if (x->source == std::string(source))
-                       {
-                               ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
-                               cmdlist.erase(i);
-                               go_again = true;
-                               break;
-                       }
+                       RemoveCommand(safei, source);
                }
        }
-
+       safei = cmdlist.begin();
+       if (safei != cmdlist.end())
+       {
+               RemoveCommand(safei, source);
+       }
        return true;
 }
 
+void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+{
+       command_t* x = safei->second;
+       if (x->source == std::string(source))
+       {
+               cmdlist.erase(safei);
+       }
+}
+
 void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 {
        std::string::size_type a;
@@ -491,7 +407,7 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 
        if (buffer.length())
        {
-               ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
+               ServerInstance->Log(DEBUG,"-> :%s %s",user->nick,buffer.c_str());
                this->ProcessCommand(user,buffer);
        }
 }
@@ -501,10 +417,7 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle)
        if (so_handle)
        {
                if (RFCCommands.find(f->command) == RFCCommands.end())
-               {
                        RFCCommands[f->command] = so_handle;
-                       ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle);
-               }
                else
                {
                        ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
@@ -516,7 +429,6 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle)
        if (cmdlist.find(f->command) == cmdlist.end())
        {
                cmdlist[f->command] = f;
-               ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
                return true;
        }
        else return false;
@@ -598,8 +510,6 @@ void CommandParser::LoadCommand(const char* name)
        command_t* (*cmd_factory_func)(InspIRCd*);
 
        snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
-       ServerInstance->Log(DEBUG,"Load command: %s", filename);
-
        h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
 
        if (!h)