Fixed invite bugs

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index cc0ed77554a00f9699bd62a8013b8c32b87961f4..c1eac632fa38b555ab6378080febabf97092c385 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1601,11 +1601,8 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                {
                                        if (servers[j] != NULL)
                                        {
-                                               if (ChanAnyOnThisServer(Ptr,servers[j]->name))
-                                               {
-                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                       log(DEBUG,"Sent J token");
-                                               }
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                               log(DEBUG,"Sent J token");
                                        }
                                }
                        }
@@ -1676,11 +1673,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                                        {
                                                if (servers[j] != NULL)
                                                {
-                                                       if (ChanAnyOnThisServer(Ptr,servers[j]->name))
-                                                       {
-                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                               log(DEBUG,"Sent L token (with reason)");
-                                                       }
+                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                       log(DEBUG,"Sent L token (with reason)");
                                                }
                                        }
                                }
@@ -1697,11 +1691,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                                        {
                                                if (servers[j] != NULL)
                                                {
-                                               if (ChanAnyOnThisServer(Ptr,servers[j]->name))
-                                                       {
-                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                               log(DEBUG,"Sent L token (no reason)");
-                                                       }
+                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                       log(DEBUG,"Sent L token (no reason)");
                                                }
                                        }
                                }
@@ -1773,7 +1764,8 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
        for (int i =0; i != MAXCHANS; i++)
        {
                /* zap it from the channel list of the user */
-               if (user->chans[i].channel == Ptr)
+               if (user->chans[i].channel)
+               if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
                {
                        WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
                        user->chans[i].uc_modes = 0;
@@ -2626,18 +2618,15 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                        WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
                                        // M token for a usermode must go to all servers
                                        char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"M %s %s",ServerName,chan->name, outstr);
+                                       snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
                                        for (int j = 0; j < 255; j++)
                                        {
                                                if (servers[j] != NULL)
                                                {
                                                        if (strcmp(servers[j]->name,ServerName))
                                                        {
-                                                               if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                                               {
-                                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                                       log(DEBUG,"Sent M token");
-                                                               }
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent M token");
                                                        }
                                                }
                                        }
@@ -2658,11 +2647,8 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                {
                                                        if (strcmp(servers[j]->name,ServerName))
                                                        {
-                                                               if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                                               {
-                                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                                       log(DEBUG,"Sent m token");
-                                                               }
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent m token");
                                                        }
                                                }
                                        }
@@ -2996,6 +2982,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                        WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
                                }
                                WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
+                               return;
                        }
                }
 
@@ -3783,10 +3770,11 @@ void handle_kick(char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
                return;
        }
+
+       char reason[MAXBUF];
        
        if (pcnt > 2)
        {
-               char reason[MAXBUF];
                strncpy(reason,parameters[2],MAXBUF);
                if (strlen(reason)>MAXKICK)
                {
@@ -3797,8 +3785,23 @@ void handle_kick(char **parameters, int pcnt, userrec *user)
        }
        else
        {
-               kick_channel(user,u,Ptr,user->nick);
+               strcpy(reason,user->nick);
+               kick_channel(user,u,Ptr,reason);
+       }
+       
+       // this must be propogated so that channel membership is kept in step network-wide
+       
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"k %s %s %s :%s",user->nick,u->nick,Ptr->name,reason);
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+               {
+                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                       log(DEBUG,"Sent k token");
+               }
        }
+       
 }
 
 
@@ -4016,6 +4019,21 @@ void handle_invite(char **parameters, int pcnt, userrec *user)
        u->InviteTo(c->name);
        WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
        WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);
+       
+       // i token must go to ALL servers!!!
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"i %s %s %s",u->nick,user->nick,c->name);
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+               {
+                       if (strcmp(servers[j]->name,ServerName))
+                       {
+                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                               log(DEBUG,"Sent i token");
+                       }
+               }
+       }
 }
 
 void handle_topic(char **parameters, int pcnt, userrec *user)
@@ -4070,6 +4088,21 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
                                strcpy(Ptr->setby,user->nick);
                                Ptr->topicset = time(NULL);
                                WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
+
+                               // t token must go to ALL servers!!!
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"t %s %s :%s",user->nick,Ptr->name,topic);
+                               for (int j = 0; j < 255; j++)
+                               {
+                                       if (servers[j] != NULL)
+                                       {
+                                               if (strcmp(servers[j]->name,ServerName))
+                                               {
+                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                       log(DEBUG,"Sent t token");
+                                               }
+                                       }
+                               }
                        }
                        else
                        {
@@ -4636,6 +4669,20 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
        }
 }
 
+void send_network_quit(const char* nick, const char* reason)
+{
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
+               for (int j = 0; j < 255; j++)
+               {
+                       if (servers[j] != NULL)
+                       {
+                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                               log(DEBUG,"Sent Q token");
+                       }
+               }
+}
+
 void handle_quit(char **parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = clientlist.find(user->nick);
@@ -4667,12 +4714,9 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
                        {
                                if (servers[j] != NULL)
                                {
-                                       if (CommonOnThisServer(user,servers[j]->name))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                               log(DEBUG,"Sent Q token");
-                                       }
-                                       }
+                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       log(DEBUG,"Sent Q token");
+                               }
                        }
                }
                else
@@ -4687,12 +4731,9 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
                        {
                                if (servers[j] != NULL)
                                {
-                                       if (CommonOnThisServer(user,servers[j]->name))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                               log(DEBUG,"Sent Q token");
-                                       }
-                                       }
+                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       log(DEBUG,"Sent Q token");
+                               }
                        }
                }
                FOREACH_MOD OnUserQuit(user);
@@ -5138,6 +5179,28 @@ void handle_modules(char **parameters, int pcnt, userrec *user)
        }
 }
 
+// calls a handler function for a command
+
+void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user)
+{
+               for (int i = 0; i < cmdlist.size(); i++)
+               {
+                       if (!strcasecmp(cmdlist[i].command,commandname))
+                       {
+                               if (cmdlist[i].handler_function)
+                               {
+                                       if (pcnt>=cmdlist[i].min_params)
+                                       {
+                                               if (strchr(user->modes,cmdlist[i].flags_needed))
+                                               {
+                                                       cmdlist[i].handler_function(parameters,pcnt,user);
+                                               }
+                                       }
+                               }
+                       }
+               }
+}
+
 void handle_stats(char **parameters, int pcnt, userrec *user)
 {
        if (pcnt != 1)
@@ -5993,6 +6056,37 @@ void handle_P(char token,char* params,serverrec* source,serverrec* reply, char*
        
 }
 
+void handle_i(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* nick = strtok(params," ");
+       char* from = strtok(NULL," ");
+       char* channel = strtok(NULL," ");
+       userrec* u = Find(nick);
+       userrec* user = Find(from);
+       chanrec* c = FindChan(channel);
+       if ((c) && (u) && (user))
+       {
+               u->InviteTo(c->name);
+               WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
+       }
+}
+
+void handle_t(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* setby = strtok(params," ");
+       char* channel = strtok(NULL," :");
+       char* topic = strtok(NULL,"\r\n");
+       topic++;
+       userrec* u = Find(setby);
+       chanrec* c = FindChan(channel);
+       if ((c) && (u))
+       {
+               WriteChannelLocal(c,u,"TOPIC %s :%s",c->name,topic);
+               strncpy(c->topic,topic,MAXTOPIC);
+               strncpy(c->setby,u->nick,NICKMAX);
+       }       
+}
+       
 
 void handle_T(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
@@ -6146,6 +6240,23 @@ void handle_n(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+// k <SOURCE> <DEST> <CHANNEL> :<REASON>
+void handle_k(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* src = strtok(params," ");
+       char* dest = strtok(NULL," ");
+       char* channel = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       reason++;
+       userrec* s = Find(src);
+       userrec* d = Find(dest);
+       chanrec* c = FindChan(channel);
+       if ((s) && (d) && (c))
+       {
+               kick_channel(s,d,c,reason);
+       }
+}
+
 void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
        char* tm = strtok(params," ");
@@ -6271,6 +6382,21 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'N':
                        handle_N(token,params,source,reply,udp_host,udp_port);
                break;
+               // t <NICK> <CHANNEL> :<TOPIC>
+               // change a channel topic
+               case 't':
+                       handle_t(token,params,source,reply,udp_host,udp_port);
+               break;
+               // i <NICK> <CHANNEL>
+               // invite a user to a channel
+               case 'i':
+                       handle_i(token,params,source,reply,udp_host,udp_port);
+               break;
+               // k <SOURCE> <DEST> <CHANNEL> :<REASON>
+               // kick a user from a channel
+               case 'k':
+                       handle_k(token,params,source,reply,udp_host,udp_port);
+               break;
                // n <NICK> <NEWNICK>
                // change nickname of client -- a server should only be able to
                // change the nicknames of clients that reside on it unless