]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Fixed /connect bug
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 813091798e5101acb67b3c61304ac41bf55ad678..e5a47fde3681fbc9d5b87eecbb6dec862a0d1137 100644 (file)
@@ -83,8 +83,6 @@ std::vector<std::string> module_names;
 extern vector<ircd_module*> factory;
 std::vector<int> fd_reap;
 
-int client_exit = 0;
-
 extern int MODCOUNT;
 
 bool nofork = false;
@@ -851,6 +849,44 @@ void WriteOpers(char* text, ...)
        }
 }
 
+// returns TRUE of any users on channel C occupy server 'servername'.
+
+bool ChanAnyOnThisServer(chanrec *c,char* servername)
+{
+       log(DEBUG,"ChanAnyOnThisServer");
+       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if (has_channel(i->second,c))
+               {
+                       if (!strcasecmp(i->second->server,servername))
+                       {
+                               return true;
+                       }
+               }
+       }
+       return false;
+}
+
+// returns true if user 'u' shares any common channels with any users on server 'servername'
+
+bool CommonOnThisServer(userrec* u,char* servername)
+{
+       log(DEBUG,"ChanAnyOnThisServer");
+       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if ((common_channels(u,i->second)) && (u != i->second))
+               {
+                       if (!strcasecmp(i->second->server,servername))
+                       {
+                               return true;
+                       }
+               }
+       }
+       return false;
+}
+
+
+
 bool hasumode(userrec* user, char mode)
 {
        if (user)
@@ -1438,17 +1474,16 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                Ptr = FindChan(cname);
                if (Ptr)
                {
-                       FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
-                       if (MOD_RESULT) {
-                               return NULL;
-                       }
-                       
                        log(DEBUG,"add_channel: joining to: %s",Ptr->name);
                        
                        // the override flag allows us to bypass channel modes
                        // and bans (used by servers)
                        if (!override)
                        {
+                               FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+                               if (MOD_RESULT) {
+                                       return NULL;
+                               }
                                
                                if (strcmp(Ptr->key,""))
                                {
@@ -1515,16 +1550,22 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                        }
                                }
                                
-                       }
+                               log(DEBUG,"add_channel: bans checked");
+                               
 
-                       log(DEBUG,"add_channel: bans checked");
+                               if ((Ptr) && (user))
+                               {
+                                       user->RemoveInvite(Ptr->name);
+                               }
+       
+                               log(DEBUG,"add_channel: invites removed");
 
-                       if ((Ptr) && (user))
+                       }
+                       else
                        {
-                               user->RemoveInvite(Ptr->name);
+                               log(DEBUG,"Overridden checks");
                        }
 
-                       log(DEBUG,"add_channel: invites removed");
                        
                }
                created = 1;
@@ -1550,6 +1591,21 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                        }
                        user->chans[i].channel = Ptr;
                        WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
+                       
+                       if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it.
+                       {
+                               // use the stamdard J token with no privilages.
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
+                               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 J token");
+                                       }
+                               }
+                       }
 
                        log(DEBUG,"Sent JOIN to client");
 
@@ -1574,7 +1630,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 /* remove a channel from a users record, and remove the record from memory
  * if the channel has become empty */
 
-chanrec* del_channel(userrec *user, const char* cname, const char* reason)
+chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
 {
        if ((!user) || (!cname))
        {
@@ -1608,9 +1664,39 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason)
                        if (reason)
                        {
                                WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
+
+                               if (!local)
+                               {
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"L %s %s :%s",user->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 L token (with reason)");
+                                               }
+                                       }
+                               }
+
+                               
                        }
                        else
                        {
+                               if (!local)
+                               {
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
+                                       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 L token (no reason)");
+                                               }
+                                       }
+                               }
+                       
                                WriteChannel(Ptr,user,"PART :%s",Ptr->name);
                        }
                        user->chans[i].uc_modes = 0;
@@ -1678,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;
@@ -1735,8 +1822,9 @@ int give_ops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
                return 0;
        }
-       if (status != STATUS_OP)
+       if (status < STATUS_OP)
        {
+               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
                WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
                return 0;
        }
@@ -1744,12 +1832,14 @@ int give_ops(userrec *user,char *dest,chanrec *chan,int status)
        {
                if (!isnick(dest))
                {
+                       log(DEFAULT,"the target nickname given to give_ops was invalid");
                        WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                        return 0;
                }
                d = Find(dest);
                if (!d)
                {
+                       log(DEFAULT,"the target nickname given to give_ops couldnt be found");
                        WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                        return 0;
                }
@@ -1757,17 +1847,21 @@ int give_ops(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if (d->chans[i].uc_modes & UCMODE_OP)
                                        {
                                                /* mode already set on user, dont allow multiple */
+                                               log(DEFAULT,"The target user given to give_ops was already opped on the channel");
                                                return 0;
                                        }
                                        d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
                                        log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
+                       log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
                }
        }
        return 1;
@@ -1805,7 +1899,8 @@ int give_hops(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if (d->chans[i].uc_modes & UCMODE_HOP)
                                        {
@@ -1814,6 +1909,7 @@ int give_hops(userrec *user,char *dest,chanrec *chan,int status)
                                        }
                                        d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
                                        log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
                }
@@ -1853,7 +1949,8 @@ int give_voice(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if (d->chans[i].uc_modes & UCMODE_VOICE)
                                        {
@@ -1862,6 +1959,7 @@ int give_voice(userrec *user,char *dest,chanrec *chan,int status)
                                        }
                                        d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
                                        log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
                }
@@ -1879,8 +1977,9 @@ int take_ops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
                return 0;
        }
-       if (status != STATUS_OP)
+       if (status < STATUS_OP)
        {
+               log(DEBUG,"%s cant give ops to %s because they have status %d and needs %d",user->nick,dest,status,STATUS_OP);
                WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
                return 0;
        }
@@ -1889,11 +1988,13 @@ int take_ops(userrec *user,char *dest,chanrec *chan,int status)
                d = Find(dest);
                if (!isnick(dest))
                {
+                       log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
                        WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                        return 0;
                }
                if (!d)
                {
+                       log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
                        WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                        return 0;
                }
@@ -1901,7 +2002,8 @@ int take_ops(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
                                        {
@@ -1910,8 +2012,10 @@ int take_ops(userrec *user,char *dest,chanrec *chan,int status)
                                        }
                                        d->chans[i].uc_modes ^= UCMODE_OP;
                                        log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
+                       log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
                }
        }
        return 1;
@@ -1949,7 +2053,8 @@ int take_hops(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
                                        {
@@ -1958,6 +2063,7 @@ int take_hops(userrec *user,char *dest,chanrec *chan,int status)
                                        }
                                        d->chans[i].uc_modes ^= UCMODE_HOP;
                                        log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
                }
@@ -1997,7 +2103,8 @@ int take_voice(userrec *user,char *dest,chanrec *chan,int status)
                {
                        for (int i = 0; i != MAXCHANS; i++)
                        {
-                               if ((d->chans[i].channel == chan) && (chan != NULL))
+                               if ((d->chans[i].channel != NULL) && (chan != NULL))
+                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
                                {
                                        if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
                                        {
@@ -2006,6 +2113,7 @@ int take_voice(userrec *user,char *dest,chanrec *chan,int status)
                                        }
                                        d->chans[i].uc_modes ^= UCMODE_VOICE;
                                        log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
+                                       return 1;
                                }
                        }
                }
@@ -2109,7 +2217,7 @@ int take_ban(userrec *user,char *dest,chanrec *chan,int status)
        return 0;
 }
 
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent)
+void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
 {
        if (!parameters) {
                log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
@@ -2132,7 +2240,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                return;
        }
 
-       log(DEBUG,"process_modes: start");
+       log(DEBUG,"process_modes: start: parameters=%d",pcnt);
 
        strcpy(modelist,parameters[1]); /* mode list, e.g. +oo-o */
                                        /* parameters[2] onwards are parameters for
@@ -2183,13 +2291,17 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                break;
 
                                case 'o':
+                                       log(DEBUG,"Ops");
                                        if ((param >= pcnt)) break;
+                                       log(DEBUG,"Enough parameters left");
                                        if (mdir == 1)
                                        {
+                                               log(DEBUG,"calling give_ops");
                                                r = give_ops(user,parameters[param++],chan,status);
                                        }
                                        else
                                        {
+                                               log(DEBUG,"calling take_ops");
                                                r = take_ops(user,parameters[param++],chan,status);
                                        }
                                        if (r)
@@ -2492,15 +2604,56 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        strcat(outstr," ");
                        strcat(outstr,outpars[ptr]);
                }
-               if (servermode)
+               if (local)
                {
-                       if (!silent)
-                               WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+                       log(DEBUG,"Local mode change");
+                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
                }
                else
                {
-                       if (!silent)
-                               WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
+                       if (servermode)
+                       {
+                               if (!silent)
+                               {
+                                       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",chan->name, outstr);
+                                       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 M token");
+                                                       }
+                                               }
+                                       }
+                               }
+                                       
+                       }
+                       else
+                       {
+                               if (!silent)
+                               {
+                                       WriteChannel(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 %s",user->nick,chan->name, outstr);
+                                       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 m token");
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
                }
        }
 }
@@ -2780,6 +2933,21 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
                        WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
 
+                       // M token for a usermode must go to all servers
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+                       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 m token");
+                                       }
+                               }
+                       }
+
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -2814,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;
                        }
                }
 
@@ -2823,7 +2992,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        return;
                }
 
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false);
+               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
        }
        else
        {
@@ -2989,6 +3158,21 @@ void server_mode(char **parameters, int pcnt, userrec *user)
 
                        WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
 
+                       // M token for a usermode must go to all servers
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
+                       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 m token");
+                                       }
+                               }
+                       }
+                       
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -3005,7 +3189,7 @@ void server_mode(char **parameters, int pcnt, userrec *user)
        Ptr = FindChan(parameters[0]);
        if (Ptr)
        {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false);
+               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
        }
        else
        {
@@ -3188,129 +3372,311 @@ void merge_mode(char **parameters, int pcnt)
                strncpy(s2.nick,ServerName,NICKMAX);
                strcpy(s2.modes,"o");
                s2.fd = -1;
-               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true);
+               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
        }
 }
 
 
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot, #darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+void merge_mode2(char **parameters, int pcnt, userrec* user)
 {
-       char plist[MAXBUF];
-       char *param;
-       char *pars[32];
-       char blog[32][MAXBUF];
-       char blog2[32][MAXBUF];
-       int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
-       char keystr[MAXBUF];
-       char moo[MAXBUF];
-
-       for (int i = 0; i <32; i++)
-               strcpy(blog[i],"");
-
-       for (int i = 0; i <32; i++)
-               strcpy(blog2[i],"");
+       chanrec* Ptr;
+       userrec* dest;
+       int can_change,i;
+       int direction = 1;
+       char outpars[MAXBUF];
 
-       strcpy(moo,"");
-       for (int i = 0; i <10; i++)
-       {
-               if (!parameters[i])
-               {
-                       parameters[i] = moo;
-               }
-       }
-       if (joins)
+       dest = Find(parameters[0]);
+       
+       // fix: ChroNiCk found this - we cant use this as debug if its null!
+       if (dest)
        {
-               if (pcnt > 1) /* we have a key to copy */
-               {
-                       strcpy(keystr,parameters[1]);
-               }
+               log(DEBUG,"merge_mode on %s",dest->nick);
        }
 
-       if (!parameters[start])
-       {
-               return 0;
-       }
-       if (!strchr(parameters[start],','))
-       {
-               return 0;
-       }
-       strcpy(plist,"");
-       for (int i = start; i <= end; i++)
+       if ((dest) && (pcnt > 1))
        {
-               if (parameters[i])
-               {
-                       strcat(plist,parameters[i]);
-               }
-       }
-       
-       j = 0;
-       param = plist;
+               log(DEBUG,"params > 1");
 
-       t = strlen(plist);
-       for (int i = 0; i < t; i++)
-       {
-               if (plist[i] == ',')
-               {
-                       plist[i] = '\0';
-                       strcpy(blog[j++],param);
-                       param = plist+i+1;
-                       if (j>20)
-                       {
-                               WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
-                               return 1;
-                       }
-               }
-       }
-       strcpy(blog[j++],param);
-       total = j;
+               char dmodes[MAXBUF];
+               strncpy(dmodes,dest->modes,MAXBUF);
 
-       if ((joins) && (keystr) && (total>0)) // more than one channel and is joining
-       {
-               strcat(keystr,",");
-       }
-       
-       if ((joins) && (keystr))
-       {
-               if (strchr(keystr,','))
+               strcpy(outpars,"+");
+               direction = 1;
+
+               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+                       return;
+
+               for (int i = 0; i < strlen(parameters[1]); i++)
                {
-                       j = 0;
-                       param = keystr;
-                       t2 = strlen(keystr);
-                       for (int i = 0; i < t2; i++)
+                       if (parameters[1][i] == '+')
                        {
-                               if (keystr[i] == ',')
+                               if (direction != 1)
                                {
-                                       keystr[i] = '\0';
-                                       strcpy(blog2[j++],param);
-                                       param = keystr+i+1;
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '+';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"+");
+                                       }
                                }
+                               direction = 1;
                        }
-                       strcpy(blog2[j++],param);
-                       total2 = j;
-               }
-       }
-
-       for (j = 0; j < total; j++)
-       {
-               if (blog[j])
+                       else
+                       if (parameters[1][i] == '-')
+                       {
+                               if (direction != 0)
+                               {
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '-';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"-");
+                                       }
+                               }
+                               direction = 0;
+                       }
+                       else
+                       {
+                               log(DEBUG,"begin mode processing entry");
+                               can_change = 1;
+                               if (can_change)
+                               {
+                                       if (direction == 1)
+                                       {
+                                               log(DEBUG,"umode %c being added",parameters[1][i]);
+                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               {
+                                                       char umode = parameters[1][i];
+                                                       log(DEBUG,"umode %c is an allowed umode",umode);
+                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       {
+                                                               dmodes[strlen(dmodes)+1]='\0';
+                                                               dmodes[strlen(dmodes)] = parameters[1][i];
+                                                               outpars[strlen(outpars)+1]='\0';
+                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                       }
+                                               }
+                                       }
+                                       else
+                                       {
+                                               // can only remove a mode they already have
+                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
+                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+                                               {
+                                                       char umode = parameters[1][i];
+                                                       log(DEBUG,"umode %c is an allowed umode",umode);
+                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       {
+                                                               int q = 0;
+                                                               char temp[MAXBUF];
+                                                               char moo[MAXBUF];       
+
+                                                               outpars[strlen(outpars)+1]='\0';
+                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                       
+                                                               strcpy(temp,"");
+                                                               for (q = 0; q < strlen(dmodes); q++)
+                                                               {
+                                                                       if (dmodes[q] != parameters[1][i])
+                                                                       {
+                                                                               moo[0] = dmodes[q];
+                                                                               moo[1] = '\0';
+                                                                               strcat(temp,moo);
+                                                                       }
+                                                               }
+                                                               strcpy(dmodes,temp);
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               if (strlen(outpars))
+               {
+                       char b[MAXBUF];
+                       strcpy(b,"");
+                       int z = 0;
+                       int i = 0;
+                       while (i < strlen (outpars))
+                       {
+                               b[z++] = outpars[i++];
+                               b[z] = '\0';
+                               if (i<strlen(outpars)-1)
+                               {
+                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
+                                       {
+                                               // someones playing silly buggers and trying
+                                               // to put a +- or -+ into the line...
+                                               i++;
+                                       }
+                               }
+                               if (i == strlen(outpars)-1)
+                               {
+                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
+                                       {
+                                               i++;
+                                       }
+                               }
+                       }
+
+                       z = strlen(b)-1;
+                       if ((b[z] == '-') || (b[z] == '+'))
+                               b[z] == '\0';
+
+                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
+                               return;
+
+                       WriteTo(user,dest,"MODE :%s",b);
+
+                       if (strlen(dmodes)>MAXMODES)
+                       {
+                               dmodes[MAXMODES-1] = '\0';
+                       }
+                       log(DEBUG,"Stripped mode line");
+                       log(DEBUG,"Line dest is now %s",dmodes);
+                       strncpy(dest->modes,dmodes,MAXMODES);
+
+               }
+
+               return;
+       }
+       
+       Ptr = FindChan(parameters[0]);
+       if (Ptr)
+       {
+               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
+               {
+                       return;
+               }
+
+               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
+       }
+}
+
+
+
+/* This function pokes and hacks at a parameter list like the following:
+ *
+ * PART #winbot, #darkgalaxy :m00!
+ *
+ * to turn it into a series of individual calls like this:
+ *
+ * PART #winbot :m00!
+ * PART #darkgalaxy :m00!
+ *
+ * The seperate calls are sent to a callback function provided by the caller
+ * (the caller will usually call itself recursively). The callback function
+ * must be a command handler. Calling this function on a line with no list causes
+ * no action to be taken. You must provide a starting and ending parameter number
+ * where the range of the list can be found, useful if you have a terminating
+ * parameter as above which is actually not part of the list, or parameters
+ * before the actual list as well. This code is used by many functions which
+ * can function as "one to list" (see the RFC) */
+
+int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+{
+       char plist[MAXBUF];
+       char *param;
+       char *pars[32];
+       char blog[32][MAXBUF];
+       char blog2[32][MAXBUF];
+       int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
+       char keystr[MAXBUF];
+       char moo[MAXBUF];
+
+       for (int i = 0; i <32; i++)
+               strcpy(blog[i],"");
+
+       for (int i = 0; i <32; i++)
+               strcpy(blog2[i],"");
+
+       strcpy(moo,"");
+       for (int i = 0; i <10; i++)
+       {
+               if (!parameters[i])
+               {
+                       parameters[i] = moo;
+               }
+       }
+       if (joins)
+       {
+               if (pcnt > 1) /* we have a key to copy */
+               {
+                       strcpy(keystr,parameters[1]);
+               }
+       }
+
+       if (!parameters[start])
+       {
+               return 0;
+       }
+       if (!strchr(parameters[start],','))
+       {
+               return 0;
+       }
+       strcpy(plist,"");
+       for (int i = start; i <= end; i++)
+       {
+               if (parameters[i])
+               {
+                       strcat(plist,parameters[i]);
+               }
+       }
+       
+       j = 0;
+       param = plist;
+
+       t = strlen(plist);
+       for (int i = 0; i < t; i++)
+       {
+               if (plist[i] == ',')
+               {
+                       plist[i] = '\0';
+                       strcpy(blog[j++],param);
+                       param = plist+i+1;
+                       if (j>20)
+                       {
+                               WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
+                               return 1;
+                       }
+               }
+       }
+       strcpy(blog[j++],param);
+       total = j;
+
+       if ((joins) && (keystr) && (total>0)) // more than one channel and is joining
+       {
+               strcat(keystr,",");
+       }
+       
+       if ((joins) && (keystr))
+       {
+               if (strchr(keystr,','))
+               {
+                       j = 0;
+                       param = keystr;
+                       t2 = strlen(keystr);
+                       for (int i = 0; i < t2; i++)
+                       {
+                               if (keystr[i] == ',')
+                               {
+                                       keystr[i] = '\0';
+                                       strcpy(blog2[j++],param);
+                                       param = keystr+i+1;
+                               }
+                       }
+                       strcpy(blog2[j++],param);
+                       total2 = j;
+               }
+       }
+
+       for (j = 0; j < total; j++)
+       {
+               if (blog[j])
                {
                        pars[0] = blog[j];
                }
@@ -3378,13 +3744,13 @@ void handle_part(char **parameters, int pcnt, userrec *user)
        {
                if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-2,0))
                        return;
-               del_channel(user,parameters[0],parameters[1]);
+               del_channel(user,parameters[0],parameters[1],false);
        }
        else
        {
                if (loop_call(handle_part,parameters,pcnt,user,0,pcnt-1,0))
                        return;
-               del_channel(user,parameters[0],NULL);
+               del_channel(user,parameters[0],NULL,false);
        }
 }
 
@@ -3404,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)
                {
@@ -3418,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");
+               }
        }
+       
 }
 
 
@@ -3476,6 +3858,21 @@ void kill_link(userrec *user,const char* r)
        if (user->registered == 7) {
                FOREACH_MOD OnUserQuit(user);
                WriteCommonExcept(user,"QUIT :%s",reason);
+
+               // Q token must go to ALL servers!!!
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
+               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 Q token");
+                               }
+                       }
+               }
        }
 
        /* push the socket on a stack of sockets due to be closed at the next opportunity
@@ -3503,8 +3900,6 @@ void kill_link(userrec *user,const char* r)
        if (user->registered == 7) {
                purge_empty_chans();
        }
-       
-       client_exit = 1;
 }
 
 
@@ -3624,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)
@@ -3678,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
                        {
@@ -3927,32 +4352,14 @@ void handle_names(char **parameters, int pcnt, userrec *user)
        c = FindChan(parameters[0]);
        if (c)
        {
-               /*WriteServ(user->fd,"353 %s = %s :%s", user->nick, c->name,*/
-               userlist(user,c);
-               WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-// returns TRUE of any users on channel C occupy server 'servername'.
-
-bool ChanAnyOnThisServer(chanrec *c,char* servername)
-{
-       log(DEBUG,"ChanAnyOnThisServer");
-       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
-       {
-               if (has_channel(i->second,c))
-               {
-                       if (!strcasecmp(i->second->server,servername))
-                       {
-                               return true;
-                       }
-               }
+               /*WriteServ(user->fd,"353 %s = %s :%s", user->nick, c->name,*/
+               userlist(user,c);
+               WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
+       }
+       else
+       {
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
        }
-       return false;
 }
 
 void handle_privmsg(char **parameters, int pcnt, userrec *user)
@@ -4090,7 +4497,21 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
                                return;
                        }
 
-                       WriteChannel(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+                       ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]);
+
+                       // if any users of this channel are on remote servers, broadcast the packet
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]);
+                       for (int j = 0; j < 255; j++)
+                       {
+                               if (servers[j] != NULL)
+                               {
+                                       if (ChanAnyOnThisServer(chan,servers[j]->name))
+                                       {
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       }
+                               }
+                       }
                }
                else
                {
@@ -4110,7 +4531,27 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
                        return;
                }
 
-               WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+               if (!strcmp(dest->server,user->server))
+               {
+                       // direct write, same server
+                       WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+               }
+               else
+               {
+                       for (int j = 0; j < 255; j++)
+                       {
+                               if (servers[j] != NULL)
+                               {
+                                       if (!strcasecmp(servers[j]->name,dest->server))
+                                       {
+                                               // direct write, same server
+                                               char buffer[MAXBUF];
+                                               snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       }
+                               }
+                       }
+               }
        }
        else
        {
@@ -4228,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);
@@ -4252,12 +4707,34 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
                        Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,parameters[0]);
                        WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,parameters[0]);
                        WriteCommonExcept(user,"QUIT :%s%s",PrefixQuit,parameters[0]);
+
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"Q %s :%s%s",user->nick,PrefixQuit,parameters[0]);
+                       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");
+                               }
+                       }
                }
                else
                {
                        Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host);
                        WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
                        WriteCommonExcept(user,"QUIT :Client exited");
+
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"Q %s :Client exited",user->nick);
+                       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");
+                               }
+                       }
                }
                FOREACH_MOD OnUserQuit(user);
                AddWhoWas(user);
@@ -4278,8 +4755,6 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
        if (user->registered == 7) {
                purge_empty_chans();
        }
-       
-       client_exit = 1;
 }
 
 void handle_who(char **parameters, int pcnt, userrec *user)
@@ -4428,23 +4903,45 @@ int usercount_unknown(void)
        return c;
 }
 
-int chancount(void)
+long chancount(void)
 {
        return chanlist.size();
 }
 
-int servercount(void)
+long count_servs(void)
 {
-       return 1;
+       int c = 0;
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+                       c++;
+       }
+       return c;
+}
+
+long servercount(void)
+{
+       return count_servs()+1;
+}
+
+long local_count()
+{
+       int c = 0;
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+       }
+       return c;
 }
 
+
 void handle_lusers(char **parameters, int pcnt, userrec *user)
 {
        WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),servercount());
        WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
        WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
        WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
-       WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,usercnt());
+       WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),count_servs());
 }
 
 void handle_admin(char **parameters, int pcnt, userrec *user)
@@ -4513,6 +5010,21 @@ void ConnectUser(userrec *user)
        ShowMOTD(user);
        FOREACH_MOD OnUserConnect(user);
        WriteOpers("*** Client connecting on port %d: %s!%s@%s",user->port,user->nick,user->ident,user->host);
+       
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,ServerName,user->fullname);
+       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 N token");
+                       }
+               }
+       }
+
 }
 
 void handle_version(char **parameters, int pcnt, userrec *user)
@@ -4689,6 +5201,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)
@@ -4808,6 +5342,7 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
                LinkPort = atoi(Link_Port);
                if (match(Link_ServerName,parameters[0])) {
                        found = true;
+                       break;
                }
        }
        
@@ -4828,6 +5363,7 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
                for (int j = 0; j < 255; j++) {
                        if (servers[j] == NULL) {
                                servers[j] = new serverrec;
+                               //servers[j]->initiator = true;
                                strcpy(servers[j]->internal_addr,Link_IPAddr);
                                servers[j]->internal_port = LinkPort;
                                strcpy(servers[j]->name,Link_ServerName);
@@ -4869,6 +5405,16 @@ char islast(serverrec* s)
        return c;
 }
 
+long map_count(serverrec* s)
+{
+       int c = 0;
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s->name))) c++;
+       }
+       return c;
+}
+
 void handle_links(char **parameters, int pcnt, userrec *user)
 {
        WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,ServerName,ServerName,ServerDesc);
@@ -4884,12 +5430,19 @@ void handle_links(char **parameters, int pcnt, userrec *user)
 
 void handle_map(char **parameters, int pcnt, userrec *user)
 {
-       WriteServ(user->fd,"006 %s :%s",user->nick,ServerName);
+       char line[MAXBUF];
+       snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName);
+       while (strlen(line) < 50)
+               strcat(line," ");
+       WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
        for (int j = 0; j < 255; j++)
        {
                if (servers[j] != NULL)
                {
-                       WriteServ(user->fd,"006 %s :%c-%s",user->nick,islast(servers[j]),servers[j]->name);
+                       snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(servers[j]),servers[j]->name);
+                       while (strlen(line) < 50)
+                               strcat(line," ");
+                       WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(servers[j]),(float)(((float)map_count(servers[j])/(float)usercnt())*100));
                }
        }
        WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
@@ -4995,6 +5548,22 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
        if (user->registered == 7)
        {
                WriteCommon(user,"NICK %s",parameters[0]);
+               
+               // Q token must go to ALL servers!!!
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]);
+               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 n token");
+                               }
+                       }
+               }
+               
        }
        
        /* change the nick of the user in the users_hash */
@@ -5431,12 +6000,14 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
 {
        char data[MAXBUF];
        // send start of sync marker: Y <timestamp>
+       // at this point the ircd receiving it starts broadcasting this netburst to all ircds
+       // except the ones its receiving it from.
        snprintf(data,MAXBUF,"Y %d",time(NULL));
        serv->SendPacket(data,udp_host,udp_port,MyKey);
        // send users and channels
        for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
-               snprintf(data,MAXBUF,"N %d %s %s %s %s %s %s :%s",u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->server,u->second->fullname);
+               snprintf(data,MAXBUF,"N %d %s %s %s %s +%s %s :%s",u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->server,u->second->fullname);
                serv->SendPacket(data,udp_host,udp_port,MyKey);
                if (strcmp(chlist(u->second),""))
                {
@@ -5465,11 +6036,42 @@ void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
        // send end of sync marker: E <timestamp>
        snprintf(data,MAXBUF,"F %d",time(NULL));
        serv->SendPacket(data,udp_host,udp_port,MyKey);
+       // ircd sends its serverlist after the end of sync here
+}
+
+
+void handle_V(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* src = strtok(params," ");
+       char* dest = strtok(NULL," :");
+       char* text = strtok(NULL,"\r\n");
+       text++;
+       
+       userrec* user = Find(src);
+       if (user)
+       {
+               userrec* dst = Find(dest);
+               
+               if (dst)
+               {
+                       WriteTo(user, dst, "NOTICE %s :%s", dst->nick, text);
+               }
+               else
+               {
+                       chanrec* d = FindChan(dest);
+                       if (d)
+                       {
+                               ChanExceptSender(d, user, "NOTICE %s :%s", d->name, text);
+                       }
+               }
+       }
+       
 }
 
+
 void handle_P(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
-       char* src = strtok(NULL," ");
+       char* src = strtok(params," ");
        char* dest = strtok(NULL," :");
        char* text = strtok(NULL,"\r\n");
        text++;
@@ -5495,6 +6097,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)
 {
@@ -5530,7 +6163,7 @@ void handle_M(char token,char* params,serverrec* source,serverrec* reply, char*
                pars[index++] = parameter;
                parameter = strtok(NULL," ");
        }
-       merge_mode(pars,--index);
+       merge_mode(pars,index);
        if (FindChan(target))
        {
                WriteChannelLocal(FindChan(target), NULL, "MODE %s",original);
@@ -5541,6 +6174,130 @@ void handle_M(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
+// m is modes set by users only (not servers) valid targets are channels or users.
+
+void handle_m(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       // m blah #chatspike +b *!test@*4
+       char* pars[128];
+       char original[MAXBUF];
+       strncpy(original,params,MAXBUF);
+       
+       if (!strchr(params,' '))
+       {
+               WriteOpers("WARNING! 'm' token in data stream without any parameters! Something fishy is going on!");
+               return;
+       }
+       
+       int index = 0;
+       
+       char* src = strtok(params," ");
+       userrec* user = Find(src);
+       
+       if (user)
+       {
+               log(DEBUG,"Found user: %s",user->nick);
+               char* parameter = strtok(NULL," ");
+               while (parameter)
+               {
+                       pars[index++] = parameter;
+                       parameter = strtok(NULL," ");
+               }
+               
+               log(DEBUG,"Calling merge_mode2");
+               merge_mode2(pars,index,user);
+       }
+}
+
+
+void handle_L(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* nick = strtok(params," ");
+       char* channel = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       userrec* user = Find(nick);
+       reason++;
+       if (user)
+       {
+               if (strcmp(reason,""))
+               {
+                       del_channel(user,channel,reason,true);
+               }
+               else
+               {
+                       del_channel(user,channel,NULL,true);
+               }
+       }
+}
+
+void handle_Q(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* nick = strtok(params," :");
+       char* reason = strtok(NULL,"\r\n");
+       reason++;
+
+       userrec* user = Find(nick);
+       
+       if (user)
+       {
+               if (strlen(reason)>MAXQUIT)
+               {
+                       reason[MAXQUIT-1] = '\0';
+               }
+
+
+               WriteCommonExcept(user,"QUIT :%s",reason);
+
+               user_hash::iterator iter = clientlist.find(user->nick);
+       
+               if (iter != clientlist.end())
+               {
+                       log(DEBUG,"deleting user hash value %d",iter->second);
+                       if ((iter->second) && (user->registered == 7)) {
+                               delete iter->second;
+                       }
+                       clientlist.erase(iter);
+               }
+
+               purge_empty_chans();
+       }
+}
+
+void handle_n(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* oldnick = strtok(params," ");
+       char* newnick = strtok(NULL," ");
+       
+       userrec* user = Find(oldnick);
+       
+       if (user)
+       {
+               WriteCommon(user,"NICK %s",newnick);
+               user = ReHashNick(user->nick, newnick);
+               if (!user) return;
+               if (!user->nick) return;
+               strncpy(user->nick, newnick,NICKMAX);
+               log(DEBUG,"new nick set: %s",user->nick);
+       }
+}
+
+// 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," ");
@@ -5552,6 +6309,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        char* server = strtok(NULL," :");
        char* gecos = strtok(NULL,"\r\n");
        gecos++;
+       modes++;
        time_t TS = atoi(tm);
        user_hash::iterator iter = clientlist.find(nick);
        if (iter != clientlist.end())
@@ -5584,6 +6342,11 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        clientlist[nick]->port = 0; // so is this...
        clientlist[nick]->registered = 7; // this however we need to set for them to receive messages and appear online
        clientlist[nick]->idle_lastmsg = time(NULL); // this is unrealiable and wont actually be used locally
+       for (int i = 0; i < MAXCHANS; i++)
+       {
+               clientlist[nick]->chans[i].channel = NULL;
+               clientlist[nick]->chans[i].uc_modes = 0;
+       }
 }
 
 void handle_F(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
@@ -5634,7 +6397,7 @@ void handle_J(char token,char* params,serverrec* source,serverrec* reply, char*
                                                if (privilage == '+')
                                                {
                                                        user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_VOICE;
-                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +o %s",channel,user->nick);
+                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +v %s",channel,user->nick);
                                                }
                                        }
                                }
@@ -5655,11 +6418,46 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                        nb_start = time(NULL);
                        WriteOpers("Server %s is starting netburst.",source->name);
                break;
+               // ?
+               // ping
+               case '?':
+                       reply->SendPacket("!",udp_host,udp_port,MyKey);
+               break;
+               // ?
+               // pong
+               case '!':
+               break;
+               // *
+               // no operation
+               case '*':
+               break;
                // N <TS> <NICK> <HOST> <DHOST> <IDENT> <MODES> <SERVER> :<GECOS>
                // introduce remote client
                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
+               // they are ulined.
+               case 'n':
+                       handle_n(token,params,source,reply,udp_host,udp_port);
+               break;
                // J <NICK> <CHANLIST>
                // Join user to channel list, merge channel permissions
                case 'J':
@@ -5670,16 +6468,36 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                case 'T':
                        handle_T(token,params,source,reply,udp_host,udp_port);
                break;
-               // M <TS> <TARGET> <MODES> [MODE-PARAMETERS]
-               // Set modes on an object
+               // M <TARGET> <MODES> [MODE-PARAMETERS]
+               // Server setting modes on an object
                case 'M':
                        handle_M(token,params,source,reply,udp_host,udp_port);
                break;
+               // m <SOURCE> <TARGET> <MODES> [MODE-PARAMETERS]
+               // User setting modes on an object
+               case 'm':
+                       handle_m(token,params,source,reply,udp_host,udp_port);
+               break;
                // P <SOURCE> <TARGET> :<TEXT>
                // Send a private/channel message
                case 'P':
                        handle_P(token,params,source,reply,udp_host,udp_port);
                break;
+               // V <SOURCE> <TARGET> :<TEXT>
+               // Send a private/channel notice
+               case 'V':
+                       handle_V(token,params,source,reply,udp_host,udp_port);
+               break;
+               // L <SOURCE> <CHANNEL> :<REASON>
+               // User parting a channel
+               case 'L':
+                       handle_L(token,params,source,reply,udp_host,udp_port);
+               break;
+               // Q <SOURCE> :<REASON>
+               // user quitting
+               case 'Q':
+                       handle_Q(token,params,source,reply,udp_host,udp_port);
+               break;
                // F <TS>
                // end netburst
                case 'F':
@@ -5745,6 +6563,7 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                                                                strcpy(servers[j]->description,serverdesc);
                                                                servers[j]->internal_port = udp_port;
                                                                // create a server record for this server
+                                                               WriteOpers("Server %s authenticated, exchanging server keys...",servername);
                                                                snprintf(response,10240,"O %d",MyKey);
                                                                serv->SendPacket(response,udp_host,udp_port,0);
                                                                return;
@@ -6077,7 +6896,7 @@ int InspIRCd(void)
        {
 
                fd_set sfd;
-               struct timeval tval;
+               timeval tval;
                FD_ZERO(&sfd);
 
                user_hash::iterator count2 = clientlist.begin();