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 7d77a6a2bd354cc23c628a1522e8f18607e8f4af..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);
 
@@ -542,14 +544,22 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
                                        WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name);
                                        return;
                                }
-                               
+
                                char topic[MAXBUF];
                                strlcpy(topic,parameters[1],MAXBUF);
                                if (strlen(topic)>MAXTOPIC)
                                {
                                        topic[MAXTOPIC-1] = '\0';
                                }
-                                       
+
+                                if (!strcasecmp(user->server,ServerName))
+                                {
+                                        int MOD_RESULT = 0;
+                                        FOREACH_RESULT(OnLocalTopicChange(user,Ptr,topic));
+                                        if (MOD_RESULT)
+                                                return;
+                                }
+
                                strlcpy(Ptr->topic,topic,MAXBUF);
                                strlcpy(Ptr->setby,user->nick,NICKMAX);
                                Ptr->topicset = TIME;
@@ -1130,7 +1140,6 @@ void handle_user(char **parameters, int pcnt, userrec *user)
                        WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick);
                }
                else {
-                       WriteServ(user->fd,"NOTICE Auth :No ident response, ident prefixed with ~");
                        strcpy(user->ident,"~"); /* we arent checking ident... but these days why bother anyway? */
                        strlcat(user->ident,parameters[0],IDENTMAX);
                        strlcpy(user->fullname,parameters[3],128);
@@ -1146,6 +1155,7 @@ void handle_user(char **parameters, int pcnt, userrec *user)
        if (user->registered == 3)
        {
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
+               FOREACH_MOD OnUserRegister(user);
                ConnectUser(user);
        }
 }
@@ -1301,6 +1311,8 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        }
 
 
+       FOREACH_MOD OnStats(*parameters[0]);
+
        if (!strcasecmp(parameters[0],"c"))
        {
                for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
@@ -1764,11 +1776,11 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
                user->dns_done = (!lookup_dns(user->nick));
                if (user->dns_done)
                        log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
-               FOREACH_MOD OnUserRegister(userrec* user);
        }
        if (user->registered == 3)
        {
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
+               FOREACH_MOD OnUserRegister(user);
                ConnectUser(user);
        }
        if (user->registered == 7)
@@ -2524,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)
        {
@@ -2741,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;
        }
 }