(TEST CODE) remote ping, do not use until debugged

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 89bec3af738fa71eed8b4ea75157f995a80f3ba1..311def7d2f0451a53f6ea5dbdd8ce3d23930e9a4 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -60,6 +60,13 @@ using namespace std;
 #include "command_parse.h"
 #include "ctables.h"
 
+#ifdef GCC3
+#define nspace __gnu_cxx
+#else
+#define nspace std
+#endif
+
+
 extern InspIRCd* ServerInstance;
 
 extern std::vector<Module*> modules;
@@ -68,15 +75,13 @@ extern std::vector<InspSocket*> module_sockets;
 extern std::vector<userrec*> local_users;
 
 extern int MODCOUNT;
-extern InspSocket* socket_ref[65535];
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
 extern time_t TIME;
 
-extern SocketEngine* SE;
-
 // 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[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 extern Server* MyServer;
 extern ServerConfig *Config;
@@ -163,7 +168,7 @@ int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec
                         plist[i] = '\0';
                         strlcpy(blog[j++],param,MAXBUF);
                         param = plist+i+1;
-                        if (j>20)
+                        if ((unsigned int)j > Config->MaxTargets)
                         {
                                 WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
                                 return 1;
@@ -248,7 +253,7 @@ int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec
 
 bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user)
 {
-       std::map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
        {
                         if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
@@ -277,7 +282,7 @@ bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec *
 
 void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user)
 {
-       std::map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
         if (n != cmdlist.end())
         {
                         if (pcnt >= n->second->min_params)
@@ -470,9 +475,9 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd)
                 }
                 else
                 {
-                        for (unsigned int i = 0; i <= strlen(cmd); i++)
+                        for (char* i = cmd; *i; i++)
                         {
-                                cmd[i] = toupper(cmd[i]);
+                                *i = toupper(*i);
                         }
                 }
 
@@ -501,6 +506,11 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd)
         }
 
         std::string xcommand = command;
+       if ((user->registered != 7) && (xcommand == "SERVER"))
+       {
+               kill_link(user,"Server connection to non-server port");
+               return;
+       }
        
        /* Tweak by brain - why was this INSIDE the mainloop? */
        if (parameters)
@@ -527,21 +537,20 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd)
                return;
        }
        
-       std::map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand);
+       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand);
        
         if (cm != cmdlist.end())
         {
-                        
-                                if (user)
+                        if (user)
+                        {
+                                /* activity resets the ping pending timer */
+                                user->nping = TIME + user->pingmax;
+                                if ((items) < cm->second->min_params)
                                 {
-                                        /* activity resets the ping pending timer */
-                                        user->nping = TIME + user->pingmax;
-                                        if ((items) < cm->second->min_params)
-                                        {
-                                                log(DEBUG,"not enough parameters: %s %s",user->nick,command);
-                                                WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
-                                                return;
-                                        }
+                                        log(DEBUG,"not enough parameters: %s %s",user->nick,command);
+                                        WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
+                                        return;
+                                }
                                         if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed))
                                         {
                                                 log(DEBUG,"permission denied: %s %s",user->nick,command);
@@ -624,9 +633,9 @@ bool CommandParser::RemoveCommands(const char* source)
         while (go_again)
         {
                 go_again = false;
-                for (std::map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+                for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
                 {
-                       command_t* x = (command_t*)*i;
+                       command_t* x = i->second;
                         if (x->source == std::string(source))
                         {
                                 log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());