Fixed strange join behavior reported by w00t (mirc requesting MODE immediately after...

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 3a30a3972fa2872a2c8a4696feb477e7340a76a1..79f1f7c78d96ceefa9b42de25a3e41c4a8ea1222 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -159,6 +159,8 @@ struct StrHashComp
                char a[MAXBUF],b[MAXBUF];
                strlcpy(a,s1.c_str(),MAXBUF);
                strlcpy(b,s2.c_str(),MAXBUF);
+                strlower(a);
+                strlower(b);
                return (strcasecmp(a,b) == 0);
        }
 
@@ -336,16 +338,16 @@ void handle_restart(char **parameters, int pcnt, userrec *user)
                sleep(1);
                for (int i = 0; i < 65536; i++)
                {
-                       int on = 0;
+                       int on = 1;
                        struct linger linger = { 0 };
                        setsockopt(i, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on));
                        linger.l_onoff = 1;
-                       linger.l_linger = 0;
+                       linger.l_linger = 1;
                        setsockopt(i, SOL_SOCKET, SO_LINGER, (const char*)&linger,sizeof(linger));
                        Blocking(i);
                        close(i);
                }
-               sleep(5);
+               sleep(2);
                
                execv(MyExecutable,argv);
 
@@ -2534,6 +2536,7 @@ void handle_pipe(char token,char* params,serverrec* source,serverrec* reply, cha
 void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* tcp_host,char* ipaddr,int port)
 {
        char buffer[MAXBUF];
+       int MOD_RESULT = 0;
 
        switch(token)
        {
@@ -2751,7 +2754,33 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                break;
                // anything else
                default:
-                       WriteOpers("WARNING! Unknown datagram type '%c'",token);
+                       MOD_RESULT = 0;
+                       string_list s;
+                       char* data = strtok(params," ");
+                       while (data)
+                       {
+                               if (*data == ':')
+                               {
+                                       // the last item is a special case
+                                       data++;
+                                       char datalast[MAXBUF];
+                                       strlcpy(datalast,data,MAXBUF);
+                                       data = strtok(NULL," ");
+                                       while (data)
+                                       {
+                                               strlcpy(datalast," ",MAXBUF);
+                                               strlcpy(datalast,data,MAXBUF);
+                                               data = strtok(NULL," ");
+                                       }
+                                       s.push_back(data);
+                                       break;
+                               }
+                               s.push_back(data);
+                               data = strtok(NULL," ");
+                       }
+                       FOREACH_RESULT(OnMeshToken(token,s,source,reply,tcp_host,ipaddr,port));
+                       if (!MOD_RESULT)
+                               WriteOpers("WARNING! Unknown datagram type '%c'",token);
                break;
        }
 }