Use safe iter for deleting while iterating

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 427633ef4663e8e81554ff40cecfb7ac8fdd533b..9b127b8bff2e3eec9da42532e524f730f581d7c6 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,118 +2,24 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#ifndef RUSAGE_SELF
-#define   RUSAGE_SELF     0
-#define   RUSAGE_CHILDREN     -1
-#endif
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
 #include "command_parse.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-
-const long duration_m = 60;
-const long duration_h = duration_m * 60;
-const long duration_d = duration_h * 24;
-const long duration_w = duration_d * 7;
-const long duration_y = duration_w * 52;
-
-extern user_hash clientlist;
-extern chan_hash chanlist;
-
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
-
-void split_chlist(userrec* user, userrec* dest, const std::string &cl)
-{
-       std::string line;
-       std::ostringstream prefix;
-       std::string::size_type start, pos, length;
-       
-       prefix << ":" << Config->ServerName << " 319 " << user->nick << " " << dest->nick << " :";
-       line = prefix.str();
-       
-       for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
-       {
-               length = (pos == std::string::npos) ? cl.length() : pos;
-               
-               if (line.length() + length - start > 510)
-               {
-                       Write_NoFormat(user->fd, line.c_str());
-                       line = prefix.str();
-               }
-               
-               if(pos == std::string::npos)
-               {
-                       line += cl.substr(start, length - start);
-                       break;
-               }
-               else
-               {
-                       line += cl.substr(start, length - start + 1);
-               }
-       }
-       
-       if (line.length())
-       {
-               Write_NoFormat(user->fd, line.c_str());
-       }
-}
-
-/* XXX - these really belong in helperfuncs perhaps -- w00t */
-bool is_uline(const char* server)
+bool InspIRCd::ULine(const char* server)
 {
        if (!server)
                return false;
@@ -123,20 +29,18 @@ bool is_uline(const char* server)
        return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int operstrcmp(const char* data,const char* input)
+int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnum)
 {
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input))
-       log(DEBUG,"operstrcmp: %d",MOD_RESULT);
+       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnum))
        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);
 }
 
-long duration(const char* str)
+long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];
        long total = 0;
@@ -146,7 +50,7 @@ long duration(const char* str)
        {
                std::string n = str;
                n += 's';
-               return duration(n.c_str());
+               return Duration(n.c_str());
        }
        
        for (char* i = (char*)str; *i; i++)
@@ -197,7 +101,7 @@ long duration(const char* str)
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool host_matches_everyone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 {
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
@@ -226,7 +130,7 @@ bool host_matches_everyone(const std::string &mask, userrec* user)
        return false;
 }
 
-bool ip_matches_everyone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
@@ -239,7 +143,7 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
        
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               if (match(u->second->GetIPString(),ip.c_str()))
+               if (match(u->second->GetIPString(),ip.c_str(),true))
                        matches++;
        }
        
@@ -252,7 +156,7 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
        return false;
 }
 
-bool nick_matches_everyone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;