]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Fixed invite bugs
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 02414ad07449ddad40c73ee7e14ad63a96d6cbac..c1eac632fa38b555ab6378080febabf97092c385 100644 (file)
@@ -76,14 +76,13 @@ int WHOWAS_MAX = 100;  // default 100 people maximum in the WHOWAS list
 int DieDelay  =  5;
 time_t startup_time = time(NULL);
 int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops
+time_t nb_start = time(NULL);
 
 extern vector<Module*> modules;
 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;
@@ -571,7 +570,7 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
 
 void WriteTo(userrec *source, userrec *dest,char *data, ...)
 {
-       if ((!source) || (!dest) || (!data))
+       if ((!dest) || (!data))
        {
                log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
                return;
@@ -582,7 +581,16 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...)
        vsnprintf(textbuffer, MAXBUF, data, argsPtr);
        va_end(argsPtr);
        chop(tb);
-       WriteFrom(dest->fd,source,"%s",textbuffer);
+
+       // if no source given send it from the server.
+       if (!source)
+       {
+               WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
+       }
+       else
+       {
+               WriteFrom(dest->fd,source,"%s",textbuffer);
+       }
 }
 
 /* write formatted text from a source user to all users on a channel
@@ -609,6 +617,42 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
        }
 }
 
+/* write formatted text from a source user to all users on a channel
+ * including the sender (NOT for privmsg, notice etc!) doesnt send to
+ * users on remote servers */
+
+void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
+{
+       if ((!Ptr) || (!text))
+       {
+               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+               return;
+       }
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+       va_start (argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if (has_channel(i->second,Ptr))
+               {
+                       if (i->second->fd != -1)
+                       {
+                               if (!user)
+                               {
+                                       WriteServ(i->second->fd,"%s",textbuffer);
+                               }
+                               else
+                               {
+                                       WriteTo(user,i->second,"%s",textbuffer);
+                               }
+                       }       
+               }
+       }
+}
+
+
 void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* text, ...)
 {
        if ((!Ptr) || (!user) || (!text))
@@ -685,7 +729,7 @@ int common_channels(userrec *u, userrec *u2)
                log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
                return 0;
        }
-       for (i = 0; i != MAXCHANS; i++)
+       for (int i = 0; i != MAXCHANS; i++)
        {
                for (z = 0; z != MAXCHANS; z++)
                {
@@ -805,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)
@@ -926,7 +1008,6 @@ void strlower(char *n)
 
 int isident(const char* n)
 {
-        int i = 0;
         char v[MAXBUF];
         if (!n)
 
@@ -937,7 +1018,7 @@ int isident(const char* n)
         {
                 return 0;
         }
-        for (i = 0; i != strlen(n); i++)
+        for (int i = 0; i != strlen(n); i++)
         {
                 if ((n[i] < 33) || (n[i] > 125))
                 {
@@ -969,7 +1050,7 @@ int isnick(const char* n)
        {
                return 0;
        }
-       for (i = 0; i != strlen(n); i++)
+       for (int i = 0; i != strlen(n); i++)
        {
                if ((n[i] < 33) || (n[i] > 125))
                {
@@ -1084,7 +1165,7 @@ char* cmode(userrec *user, chanrec *chan)
        }
 
        int i;
-       for (i = 0; i != MAXCHANS; i++)
+       for (int i = 0; i != MAXCHANS; i++)
        {
                if ((user->chans[i].channel == chan) && (chan != NULL))
                {
@@ -1191,8 +1272,7 @@ int cstatus(userrec *user, chanrec *chan)
                return 0;
        }
 
-       int i;
-       for (i = 0; i != MAXCHANS; i++)
+       for (int i = 0; i != MAXCHANS; i++)
        {
                if ((user->chans[i].channel == chan) && (chan != NULL))
                {
@@ -1330,7 +1410,7 @@ int usercount(chanrec *c)
 /* add a channel to a user, creating the record for it if needed and linking
  * it to the user record */
 
-chanrec* add_channel(userrec *user, const char* cn, const char* key)
+chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override)
 {
        if ((!user) || (!cn))
        {
@@ -1348,10 +1428,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key)
        // we MUST declare this wherever we use FOREACH_RESULT
        int MOD_RESULT = 0;
 
-       if ((!cname) || (!user))
-       {
-               return NULL;
-       }
        if (strlen(cname) > CHANMAX-1)
        {
                cname[CHANMAX-1] = '\0';
@@ -1398,76 +1474,98 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key)
                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);
-                       if (strcmp(Ptr->key,""))
+                       
+                       // the override flag allows us to bypass channel modes
+                       // and bans (used by servers)
+                       if (!override)
                        {
-                               log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
-                               if (!key)
-                               {
-                                       log(DEBUG,"add_channel: no key given in JOIN");
-                                       WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+                               FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+                               if (MOD_RESULT) {
                                        return NULL;
                                }
-                               else
+                               
+                               if (strcmp(Ptr->key,""))
                                {
-                                       log(DEBUG,"key at %p is %s",key,key);
-                                       if (strcasecmp(key,Ptr->key))
+                                       log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
+                                       if (!key)
                                        {
-                                               log(DEBUG,"add_channel: bad key given in JOIN");
-                                               WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+                                               log(DEBUG,"add_channel: no key given in JOIN");
+                                               WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
                                                return NULL;
                                        }
+                                       else
+                                       {
+                                               log(DEBUG,"key at %p is %s",key,key);
+                                               if (strcasecmp(key,Ptr->key))
+                                               {
+                                                       log(DEBUG,"add_channel: bad key given in JOIN");
+                                                       WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
                                }
-                       }
-                       log(DEBUG,"add_channel: no key");
-
-                       if (Ptr->inviteonly)
-                       {
-                               log(DEBUG,"add_channel: channel is +i");
-                               if (user->IsInvited(Ptr->name))
+                               log(DEBUG,"add_channel: no key");
+       
+                               if (Ptr->inviteonly)
                                {
-                                       /* user was invited to channel */
-                                       /* there may be an optional channel NOTICE here */
+                                       log(DEBUG,"add_channel: channel is +i");
+                                       if (user->IsInvited(Ptr->name))
+                                       {
+                                               /* user was invited to channel */
+                                               /* there may be an optional channel NOTICE here */
+                                       }
+                                       else
+                                       {
+                                               WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+                                               return NULL;
+                                       }
                                }
-                               else
+                               log(DEBUG,"add_channel: channel is not +i");
+       
+                               if (Ptr->limit)
                                {
-                                       WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
-                                       return NULL;
+                                       if (usercount(Ptr) == Ptr->limit)
+                                       {
+                                               WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+                                               return NULL;
+                                       }
                                }
-                       }
-                       log(DEBUG,"add_channel: channel is not +i");
-
-                       if (Ptr->limit)
-                       {
-                               if (usercount(Ptr) == Ptr->limit)
+                               
+                               log(DEBUG,"add_channel: about to walk banlist");
+       
+                               /* check user against the channel banlist */
+                               if (Ptr)
                                {
-                                       WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
-                                       return NULL;
+                                       if (Ptr->bans.size())
+                                       {
+                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                                               {
+                                                       if (match(user->GetFullHost(),i->data))
+                                                       {
+                                                               WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+                                                               return NULL;
+                                                       }
+                                               }
+                                       }
                                }
-                       }
-                       
-                       log(DEBUG,"add_channel: about to walk banlist");
+                               
+                               log(DEBUG,"add_channel: bans checked");
+                               
 
-                       /* check user against the channel banlist */
-                       for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                       {
-                               if (match(user->GetFullHost(),i->data))
+                               if ((Ptr) && (user))
                                {
-                                       WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
-                                       return NULL;
+                                       user->RemoveInvite(Ptr->name);
                                }
-                       }
-
-                       log(DEBUG,"add_channel: bans checked");
+       
+                               log(DEBUG,"add_channel: invites removed");
 
-                       user->RemoveInvite(Ptr->name);
+                       }
+                       else
+                       {
+                               log(DEBUG,"Overridden checks");
+                       }
 
-                       log(DEBUG,"add_channel: invites removed");
                        
                }
                created = 1;
@@ -1475,11 +1573,12 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key)
 
        log(DEBUG,"Passed channel checks");
        
-       for (i =0; i != MAXCHANS; i++)
+       for (int i =0; i != MAXCHANS; i++)
        {
+               log(DEBUG,"Check location %d",i);
                if (user->chans[i].channel == NULL)
                {
-                       log(DEBUG,"Adding into their channel list");
+                       log(DEBUG,"Adding into their channel list at location %d",i);
 
                        if (created == 2) 
                        {
@@ -1492,6 +1591,21 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key)
                        }
                        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");
 
@@ -1516,7 +1630,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key)
 /* 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))
        {
@@ -1524,7 +1638,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason)
                return NULL;
        }
 
-       int i = 0;
        chanrec* Ptr;
        int created = 0;
 
@@ -1543,7 +1656,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason)
        FOREACH_MOD OnUserPart(user,Ptr);
        log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
        
-       for (i =0; i != MAXCHANS; i++)
+       for (int i =0; i != MAXCHANS; i++)
        {
                /* zap it from the channel list of the user */
                if (user->chans[i].channel == Ptr)
@@ -1551,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;
@@ -1618,10 +1761,11 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                return;
        }
        
-       for (i =0; i != MAXCHANS; i++)
+       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;
@@ -1653,14 +1797,12 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 
 int has_channel(userrec *u, chanrec *c)
 {
-       int i = 0;
-
        if ((!u) || (!c))
        {
                log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
                return 0;
        }
-       for (i =0; i != MAXCHANS; i++)
+       for (int i =0; i != MAXCHANS; i++)
        {
                if (u->chans[i].channel == c)
                {
@@ -1680,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;
        }
@@ -1689,30 +1832,36 @@ 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;
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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;
@@ -1748,9 +1897,10 @@ int give_hops(userrec *user,char *dest,chanrec *chan,int status)
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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)
                                        {
@@ -1759,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;
                                }
                        }
                }
@@ -1796,9 +1947,10 @@ int give_voice(userrec *user,char *dest,chanrec *chan,int status)
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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)
                                        {
@@ -1807,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;
                                }
                        }
                }
@@ -1824,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;
        }
@@ -1834,19 +1988,22 @@ 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;
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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)
                                        {
@@ -1855,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;
@@ -1892,9 +2051,10 @@ int take_hops(userrec *user,char *dest,chanrec *chan,int status)
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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)
                                        {
@@ -1903,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;
                                }
                        }
                }
@@ -1940,9 +2101,10 @@ int take_voice(userrec *user,char *dest,chanrec *chan,int status)
                }
                else
                {
-                       for (i = 0; i != MAXCHANS; i++)
+                       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)
                                        {
@@ -1951,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;
                                }
                        }
                }
@@ -2054,14 +2217,13 @@ 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)
+void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
 {
-       if ((!parameters) || (!user)) {
+       if (!parameters) {
                log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
                return;
        }
 
-
        char modelist[MAXBUF];
        char outlist[MAXBUF];
        char outstr[MAXBUF];
@@ -2078,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
@@ -2129,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)
@@ -2438,13 +2604,56 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        strcat(outstr," ");
                        strcat(outstr,outpars[ptr]);
                }
-               if (servermode)
+               if (local)
                {
-                       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
                {
-                       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");
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
                }
        }
 }
@@ -2499,6 +2708,17 @@ bool allowed_umode(char umode, char* sourcemodes,bool adding)
 
 bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
 {
+       userrec* s2;
+       bool faked = false;
+       if (!source)
+       {
+               s2 = new userrec;
+               strncpy(s2->nick,ServerName,NICKMAX);
+               strcpy(s2->modes,"o");
+               s2->fd = -1;
+               source = s2;
+               faked = true;
+       }
        string_list p;
        p.clear();
        if (ModeDefined(umode,MT_CLIENT))
@@ -2512,11 +2732,21 @@ bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
                        }
                }
                log(DEBUG,"No module claims umode %c",umode);
+               if (faked)
+               {
+                       delete s2;
+                       source = NULL;
+               }
                return false;
        }
        else
        {
                log(DEBUG,"*** BUG *** Non-module umode passed to process_module_umode!");
+               if (faked)
+               {
+                       delete s2;
+                       source = NULL;
+               }
                return false;
        }
 }
@@ -2531,6 +2761,11 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
        dest = Find(parameters[0]);
 
+       if (!user)
+       {
+               return;
+       }
+
        if ((dest) && (pcnt == 1))
        {
                WriteServ(user->fd,"221 %s :+%s",user->nick,user->modes);
@@ -2567,7 +2802,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
                        return;
 
-               for (i = 0; i < strlen(parameters[1]); i++)
+               for (int i = 0; i < strlen(parameters[1]); i++)
                {
                        if (parameters[1][i] == '+')
                        {
@@ -2698,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';
@@ -2732,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;
                        }
                }
 
@@ -2741,7 +2992,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        return;
                }
 
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false);
+               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
        }
        else
        {
@@ -2781,7 +3032,7 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
                        return;
 
-               for (i = 0; i < strlen(parameters[1]); i++)
+               for (int i = 0; i < strlen(parameters[1]); i++)
                {
                        if (parameters[1][i] == '+')
                        {
@@ -2907,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';
@@ -2923,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);
+               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
        }
        else
        {
@@ -2932,67 +3198,428 @@ void server_mode(char **parameters, int pcnt, userrec *user)
 }
 
 
-/* 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_mode(char **parameters, int pcnt)
 {
-       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 (i = 0; i <32; i++)
-               strcpy(blog[i],"");
-
-       for (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 (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])
+       if ((dest) && (pcnt > 1))
        {
-               return 0;
+               log(DEBUG,"params > 1");
+
+               char dmodes[MAXBUF];
+               strncpy(dmodes,dest->modes,MAXBUF);
+
+               strcpy(outpars,"+");
+               direction = 1;
+
+               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+                       return;
+
+               for (int i = 0; i < strlen(parameters[1]); i++)
+               {
+                       if (parameters[1][i] == '+')
+                       {
+                               if (direction != 1)
+                               {
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '+';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"+");
+                                       }
+                               }
+                               direction = 1;
+                       }
+                       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],"o",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],"o",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;
+
+                       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)
+       {
+               userrec s2;
+               strncpy(s2.nick,ServerName,NICKMAX);
+               strcpy(s2.modes,"o");
+               s2.fd = -1;
+               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
+       }
+}
+
+
+void merge_mode2(char **parameters, int pcnt, userrec* user)
+{
+       chanrec* Ptr;
+       userrec* dest;
+       int can_change,i;
+       int direction = 1;
+       char outpars[MAXBUF];
+
+       dest = Find(parameters[0]);
+       
+       // fix: ChroNiCk found this - we cant use this as debug if its null!
+       if (dest)
+       {
+               log(DEBUG,"merge_mode on %s",dest->nick);
+       }
+
+       if ((dest) && (pcnt > 1))
+       {
+               log(DEBUG,"params > 1");
+
+               char dmodes[MAXBUF];
+               strncpy(dmodes,dest->modes,MAXBUF);
+
+               strcpy(outpars,"+");
+               direction = 1;
+
+               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+                       return;
+
+               for (int i = 0; i < strlen(parameters[1]); i++)
+               {
+                       if (parameters[1][i] == '+')
+                       {
+                               if (direction != 1)
+                               {
+                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       {
+                                               outpars[strlen(outpars)-1] = '+';
+                                       }
+                                       else
+                                       {
+                                               strcat(outpars,"+");
+                                       }
+                               }
+                               direction = 1;
+                       }
+                       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 (i = start; i <= end; i++)
+       for (int i = start; i <= end; i++)
        {
                if (parameters[i])
                {
@@ -3004,7 +3631,7 @@ int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start
        param = plist;
 
        t = strlen(plist);
-       for (i = 0; i < t; i++)
+       for (int i = 0; i < t; i++)
        {
                if (plist[i] == ',')
                {
@@ -3033,7 +3660,7 @@ int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start
                        j = 0;
                        param = keystr;
                        t2 = strlen(keystr);
-                       for (i = 0; i < t2; i++)
+                       for (int i = 0; i < t2; i++)
                        {
                                if (keystr[i] == ',')
                                {
@@ -3104,7 +3731,7 @@ void handle_join(char **parameters, int pcnt, userrec *user)
                return;
        if (parameters[0][0] == '#')
        {
-               Ptr = add_channel(user,parameters[0],parameters[1]);
+               Ptr = add_channel(user,parameters[0],parameters[1],false);
        }
 }
 
@@ -3117,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);
        }
 }
 
@@ -3143,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)
                {
@@ -3157,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");
+               }
        }
+       
 }
 
 
@@ -3215,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
@@ -3242,8 +3900,6 @@ void kill_link(userrec *user,const char* r)
        if (user->registered == 7) {
                purge_empty_chans();
        }
-       
-       client_exit = 1;
 }
 
 
@@ -3363,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)
@@ -3417,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
                        {
@@ -3647,6 +4333,12 @@ void AddClient(int socket, char* host, int port, bool iscached)
        clientlist[tempnick]->timeout = time(NULL)+class_regtimeout;
        clientlist[tempnick]->flood = class_flood;
 
+       for (int i = 0; i < MAXCHANS; i++)
+       {
+               clientlist[tempnick]->chans[i].channel = NULL;
+               clientlist[tempnick]->chans[i].uc_modes = 0;
+       }
+
        if (clientlist.size() == MAXCLIENTS)
                kill_link(clientlist[tempnick],"No more connections allowed in this class");
 }
@@ -3670,7 +4362,6 @@ void handle_names(char **parameters, int pcnt, userrec *user)
        }
 }
 
-
 void handle_privmsg(char **parameters, int pcnt, userrec *user)
 {
        userrec *dest;
@@ -3704,6 +4395,20 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
                        }
                        
                        ChanExceptSender(chan, user, "PRIVMSG %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,"P %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
                {
@@ -3728,8 +4433,30 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
                if (MOD_RESULT) {
                        return;
                }
-               
-               WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+
+
+
+               if (!strcmp(dest->server,user->server))
+               {
+                       // direct write, same server
+                       WriteTo(user, dest, "PRIVMSG %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,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
+                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                       }
+                               }
+                       }
+               }
        }
        else
        {
@@ -3770,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
                {
@@ -3790,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
        {
@@ -3812,7 +4573,7 @@ char* chlist(userrec *user)
        {
                return lst;
        }
-       for (i = 0; i != MAXCHANS; i++)
+       for (int i = 0; i != MAXCHANS; i++)
        {
                if (user->chans[i].channel != NULL)
                {
@@ -3832,6 +4593,10 @@ char* chlist(userrec *user)
                        }
                }
        }
+       if (strlen(lst))
+       {
+               lst[strlen(lst)-1] = '\0'; // chop trailing space
+       }
        return lst;
 }
 
@@ -3904,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);
@@ -3928,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);
@@ -3944,18 +4745,16 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
        
        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);
+               log(DEBUG,"deleting user hash value %d",iter->second);
+               //if ((user) && (user->registered == 7)) {
+                       //delete user;
+               //}
        }
 
        if (user->registered == 7) {
                purge_empty_chans();
        }
-       
-       client_exit = 1;
 }
 
 void handle_who(char **parameters, int pcnt, userrec *user)
@@ -4189,6 +4988,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)
@@ -4331,7 +5145,7 @@ void handle_whowas(char **parameters, int pcnt, userrec* user)
 
 void handle_trace(char **parameters, int pcnt, userrec *user)
 {
-       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
                if (i->second)
                {
@@ -4365,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)
@@ -4505,6 +5341,7 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
                        if (servers[j] == NULL) {
                                servers[j] = new serverrec;
                                strcpy(servers[j]->internal_addr,Link_IPAddr);
+                               servers[j]->internal_port = LinkPort;
                                strcpy(servers[j]->name,Link_ServerName);
                                log(DEBUG,"Allocated new serverrec");
                                if (!me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass))
@@ -4527,6 +5364,50 @@ void handle_squit(char **parameters, int pcnt, userrec *user)
        // send out an squit across the mesh and then clear the server list (for local squit)
 }
 
+char islast(serverrec* s)
+{
+       char c = '`';
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+               {
+                       c = '|';
+               }
+               if (servers[j] == s)
+               {
+                       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);
+       for (int j = 0; j < 255; j++)
+       {
+               if (servers[j] != NULL)
+               {
+                       WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,servers[j]->name,ServerName,servers[j]->description);
+               }
+       }
+       WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick);
+}
+
+void handle_map(char **parameters, int pcnt, userrec *user)
+{
+       WriteServ(user->fd,"006 %s :%s",user->nick,ServerName);
+       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);
+               }
+       }
+       WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
+}
+
+
 void handle_oper(char **parameters, int pcnt, userrec *user)
 {
        char LoginName[MAXBUF];
@@ -4536,7 +5417,7 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
        char Hostname[MAXBUF];
        int i,j;
 
-       for (i = 0; i < ConfValueEnum("oper",&config_f); i++)
+       for (int i = 0; i < ConfValueEnum("oper",&config_f); i++)
        {
                ConfValue("oper","name",i,LoginName,&config_f);
                ConfValue("oper","password",i,Password,&config_f);
@@ -4626,6 +5507,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 */
@@ -4702,7 +5599,7 @@ int process_parameters(char **command_p,char *parameters)
                }
        }
        command_p[j++] = parameters;
-       for (i = 0; i <= q; i++)
+       for (int i = 0; i <= q; i++)
        {
                if (parameters[i] == ' ')
                {
@@ -4793,7 +5690,7 @@ void process_command(userrec *user, char* cmd)
                strcpy(cmd,"");
                j = 0;
                /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */
-               for (i = 0; i < strlen(temp); i++)
+               for (int i = 0; i < strlen(temp); i++)
                {
                        if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7))
                        {
@@ -4807,7 +5704,7 @@ void process_command(userrec *user, char* cmd)
                command = cmd;
                if (strchr(cmd,' '))
                {
-                       for (i = 0; i <= strlen(cmd); i++)
+                       for (int i = 0; i <= strlen(cmd); i++)
                        {
                                /* capitalise the command ONLY, leave params intact */
                                cmd[i] = toupper(cmd[i]);
@@ -4823,7 +5720,7 @@ void process_command(userrec *user, char* cmd)
                }
                else
                {
-                       for (i = 0; i <= strlen(cmd); i++)
+                       for (int i = 0; i <= strlen(cmd); i++)
                        {
                                cmd[i] = toupper(cmd[i]);
                        }
@@ -4853,7 +5750,7 @@ void process_command(userrec *user, char* cmd)
                }
        }
 
-       for (i = 0; i != cmdlist.size(); i++)
+       for (int i = 0; i != cmdlist.size(); i++)
        {
                if (strcmp(cmdlist[i].command,""))
                {
@@ -5011,6 +5908,8 @@ void SetupCommandTable(void)
        createcommand("CONNECT",handle_connect,'o',1);
        createcommand("SQUIT",handle_squit,'o',1);
        createcommand("MODULES",handle_modules,'o',0);
+       createcommand("LINKS",handle_links,0,0);
+       createcommand("MAP",handle_map,0,0);
 }
 
 void process_buffer(const char* cmdbuf,userrec *user)
@@ -5060,40 +5959,412 @@ 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),""))
                {
-                       snprintf(data,MAXBUF,"J %s :%s",u->second->nick,chlist(u->second));
+                       snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second));
                        serv->SendPacket(data,udp_host,udp_port,MyKey);
                }
        }
        // send channel modes, topics etc...
        for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
        {
-               snprintf(data,MAXBUF,"C %s %d %s :%s",c->second->name,c->second->created,c->second->setby,chanmodes(c->second));
+               snprintf(data,MAXBUF,"M %s +%s",c->second->name,chanmodes(c->second));
                serv->SendPacket(data,udp_host,udp_port,MyKey);
                if (strcmp(c->second->topic,""))
                {
-                       snprintf(data,MAXBUF,"T %d %s :%s",c->second->topicset,c->second->name,c->second->topic);
+                       snprintf(data,MAXBUF,"T %d %s %s :%s",c->second->topicset,c->second->setby,c->second->name,c->second->topic);
+                       serv->SendPacket(data,udp_host,udp_port,MyKey);
                }
-               serv->SendPacket(data,udp_host,udp_port,MyKey);
                // send current banlist
                
                for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++)
                {
-                       snprintf(data,MAXBUF,"M %d %s +b %s",b->set_time,c->second->name,b->data);
+                       snprintf(data,MAXBUF,"M %s +b %s",b->set_time,c->second->name,b->data);
                        serv->SendPacket(data,udp_host,udp_port,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(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, "PRIVMSG %s :%s", dst->nick, text);
+               }
+               else
+               {
+                       chanrec* d = FindChan(dest);
+                       if (d)
+                       {
+                               ChanExceptSender(d, user, "PRIVMSG %s :%s", d->name, text);
+                       }
+               }
+       }
+       
+}
+
+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)
+{
+       char* tm = strtok(params," ");
+       char* setby = strtok(NULL," ");
+       char* channel = strtok(NULL," :");
+       char* topic = strtok(NULL,"\r\n");
+       topic++;
+       time_t TS = atoi(tm);
+       chanrec* c = FindChan(channel);
+       if (c)
+       {
+               // in the case of topics and TS, the *NEWER* 
+               if (TS <= c->topicset)
+               {
+                       WriteChannelLocal(c,NULL,"TOPIC %s :%s",c->name,topic);
+                       strncpy(c->topic,topic,MAXTOPIC);
+                       strncpy(c->setby,setby,NICKMAX);
+               }
+       }       
+}
+       
+void handle_M(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       char* pars[128];
+       char original[MAXBUF],target[MAXBUF];
+       strncpy(original,params,MAXBUF);
+       int index = 0;
+       char* parameter = strtok(params," ");
+       strncpy(target,parameter,MAXBUF);
+       while (parameter)
+       {
+               pars[index++] = parameter;
+               parameter = strtok(NULL," ");
+       }
+       merge_mode(pars,index);
+       if (FindChan(target))
+       {
+               WriteChannelLocal(FindChan(target), NULL, "MODE %s",original);
+       }
+       if (Find(target))
+       {
+               WriteTo(NULL,Find(target),"MODE %s",original);
+       }
+}
+
+// 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," ");
+       char* nick = strtok(NULL," ");
+       char* host = strtok(NULL," ");
+       char* dhost = strtok(NULL," ");
+       char* ident = strtok(NULL," ");
+       char* modes = strtok(NULL," ");
+       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())
+       {
+               // nick collision
+               WriteOpers("Nickname collision: %s@%s != %s@%s",nick,server,iter->second->nick,iter->second->server);
+               if (TS >= iter->second->age)
+               {
+                       char str[MAXBUF];
+                       snprintf(str,MAXBUF,"Killed (Nick Collision (%s@%s < %s@%s))",nick,server,iter->second->nick,iter->second->server);
+                       WriteServ(iter->second->fd, "KILL %s :%s",iter->second->nick,str);
+                       // client on remote server is older than the local user, kill the local user
+                       kill_link(iter->second,str);
+               }
+       }
+       clientlist[nick] = new userrec();
+       // remote users have an fd of -1. This is so that our Write abstraction
+       // routines know to route any messages to this record away to whatever server
+       // theyre on.
+       clientlist[nick]->fd = -1;
+       strncpy(clientlist[nick]->nick, nick,NICKMAX);
+       strncpy(clientlist[nick]->host, host,160);
+       strncpy(clientlist[nick]->dhost, dhost,160);
+       strncpy(clientlist[nick]->server, server,256);
+       strncpy(clientlist[nick]->ident, ident,10); // +1 char to compensate for '~'
+       strncpy(clientlist[nick]->fullname, gecos,128);
+       clientlist[nick]->signon = TS;
+       clientlist[nick]->nping = 0; // this is ignored for a remote user anyway.
+       clientlist[nick]->lastping = 1;
+       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)
+{
+       long tdiff = time(NULL) - atoi(params);
+       if (tdiff)
+               WriteOpers("TS split for %s -> %s: %d",source->name,reply->name,tdiff);
+}
+
+void handle_J(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+{
+       // IMPORTANT NOTE
+       // The J token currently has no timestamp - this needs looking at
+       // because it will allow splitriding.
+       char* nick = strtok(params," ");
+       char* channel = strtok(NULL," ");
+       userrec* user = Find(nick);
+       while (channel)
+       {
+               if ((user != NULL) && (strcmp(channel,"")))
+               {
+                       char privilage = '\0';
+                       if (channel[0] != '#')
+                       {
+                               privilage = channel[0];
+                               channel++;
+                       }
+                       add_channel(user,channel,"",true);
+
+                       // now work out the privilages they should have on each channel
+                       // and send the appropriate servermodes.
+                       for (int i = 0; i != MAXCHANS; i++)
+                       {
+                               if (user->chans[i].channel)
+                               {
+                                       if (!strcasecmp(user->chans[i].channel->name,channel))
+                                       {
+                                               if (privilage == '@')
+                                               {
+                                                       user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_OP;
+                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +o %s",channel,user->nick);
+                                               }
+                                               if (privilage == '%')
+                                               {
+                                                       user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_HOP;
+                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +h %s",channel,user->nick);
+                                               }
+                                               if (privilage == '+')
+                                               {
+                                                       user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_VOICE;
+                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +v %s",channel,user->nick);
+                                               }
+                                       }
+                               }
+                       }
+
+               }
+               channel = strtok(NULL," ");
+       }
 }
 
 void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
@@ -5103,86 +6374,85 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                // Y <TS>
                // start netburst
                case 'Y':
+                       nb_start = time(NULL);
+                       WriteOpers("Server %s is starting netburst.",source->name);
                break;
                // N <TS> <NICK> <HOST> <DHOST> <IDENT> <MODES> <SERVER> :<GECOS>
                // introduce remote client
                case 'N':
-               {
-                       printf("Sync: Received an 'N' packet, processing");
-                       char* tm = strtok(params," ");
-                       char* nick = strtok(params," ");
-                       char* host = strtok(params," ");
-                       char* dhost = strtok(params," ");
-                       char* ident = strtok(params," ");
-                       char* modes = strtok(params," ");
-                       char* server = strtok(params," ");
-                       char* gecos = strchr(params,':') + 1;
-                       time_t TS = atoi(tm);
-                       user_hash::iterator iter = clientlist.find(nick);
-                       if (iter != clientlist.end())
-                       {
-                               // nick collision
-                               // TODO: make this work!
-                               WriteOpers("Nickname collision: %s@%s != %s@%s",nick,server,iter->second->nick,iter->second->server);
-                               return;
-                       }
-                       clientlist[nick] = new userrec();
-                       // remote users have an fd of -1. This is so that our Write abstraction
-                       // routines know to route any messages to this record away to whatever server
-                       // theyre on.
-                       clientlist[nick]->fd = -1;
-                       strncpy(clientlist[nick]->nick, nick,NICKMAX);
-                       strncpy(clientlist[nick]->host, host,160);
-                       strncpy(clientlist[nick]->dhost, dhost,160);
-                       strncpy(clientlist[nick]->server, server,256);
-                       strncpy(clientlist[nick]->ident, ident,10); // +1 char to compensate for '~'
-                       clientlist[nick]->signon = TS;
-                       clientlist[nick]->nping = 0; // this is ignored for a remote user anyway.
-                       clientlist[nick]->lastping = 1;
-                       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 will have to update as they pm us,
-                                                        // so a user wont need /WHOIS <nick> <server> to find it
-                                                        // but it may be slightly different over the net
-                                                        // (a couple of seconds at most)
-                       printf("Sync: Added %s",nick);
-               }
+                       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;
-               // J <NICK> :<CHANLIST>
+               // 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':
-               {
-               }
-               break;
-               // C <CHANNEL> <TS> <TOPICSETTER> :<MODES>
-               // initialise channel (netburst only)
-               case 'C':
-               {
-               }
+                       handle_J(token,params,source,reply,udp_host,udp_port);
                break;
-               // T <TS> <CHANNEL> :<TOPIC>
+               // T <TS> <CHANNEL> <TOPICSETTER> :<TOPIC>
                // change channel topic (netburst only)
                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':
-               {
-               }
+                       WriteOpers("Server %s has completed netburst. (%d secs)",source->name,time(NULL)-nb_start);
+                       handle_F(token,params,source,reply,udp_host,udp_port);
                break;
                // anything else
                default:
-               {
                        WriteOpers("WARNING! Unknown datagram type '%c'",token);
-               }
                break;
        }
 }
@@ -5203,7 +6473,7 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                char* servername = strtok(params," ");
                char* password = strtok(NULL," ");
                char* serverdesc = finalparam+2;
-               WriteOpers("CONNECT from %s (%s)",servername,udp_host,password,serverdesc);
+               WriteOpers("CONNECT from %s (%s)",servername,udp_host);
                
                
                char Link_ServerName[1024];
@@ -5236,6 +6506,8 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                                                                servers[j] = new serverrec;
                                                                strcpy(servers[j]->internal_addr,udp_host);
                                                                strcpy(servers[j]->name,servername);
+                                                               strcpy(servers[j]->description,serverdesc);
+                                                               servers[j]->internal_port = udp_port;
                                                                // create a server record for this server
                                                                snprintf(response,10240,"O %d",MyKey);
                                                                serv->SendPacket(response,udp_host,udp_port,0);
@@ -5322,6 +6594,7 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                                                for (int j = 0; j < 255; j++) {
                                                        if (servers[j] != NULL) {
                                                                if (!strcasecmp(servers[j]->internal_addr,udp_host)) {
+                                                                       strcpy(servers[j]->description,serverdesc);
                                                                        WriteOpers("Server %s authenticated, exchanging server keys...",servername);
                                                                        snprintf(response,10240,"O %d",MyKey);
                                                                        serv->SendPacket(response,udp_host,udp_port,0);
@@ -5567,10 +6840,18 @@ int InspIRCd(void)
        for (;;)
        {
 
+               fd_set sfd;
+               struct timeval tval;
+               FD_ZERO(&sfd);
+
+               user_hash::iterator count2 = clientlist.begin();
+
                // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
                // them in a list, then reap the list every second or so.
-               if (reap_counter>5000) {
-                       if (fd_reap.size() > 0) {
+               if (reap_counter>5000)
+               {
+                       if (fd_reap.size() > 0)
+                       {
                                for( int n = 0; n < fd_reap.size(); n++)
                                {
                                        Blocking(fd_reap[n]);
@@ -5598,16 +6879,13 @@ int InspIRCd(void)
                                handle_link_packet(theirkey, udp_msg, udp_host, udp_port, me[x]);
                                // link packets can manipulate the usertable so beware of
                                // any loops here watching the user or channels hash
+                               log(DEBUG,"Sync: exit 3");
+                               goto label;
                        }
                }
        }
        
-       fd_set sfd;
-       struct timeval tval;
-       FD_ZERO(&sfd);
 
-       user_hash::iterator count2 = clientlist.begin();
-       
        while (count2 != clientlist.end())
        {
                char data[10240];
@@ -5621,7 +6899,7 @@ int InspIRCd(void)
                if (!count2->second) break;
                
                if (count2->second)
-               if (count2->second->fd)
+               if (count2->second->fd != 0)
                {
                        // assemble up to 64 sockets into an fd_set
                        // to implement a pooling mechanism.
@@ -5658,9 +6936,9 @@ int InspIRCd(void)
                                                        count2->second->lastping = 0;
                                                        count2->second->nping = time(NULL)+120;
                                                }
-                                               count2++;
-                                               total_in_this_set++;
                                        }
+                                       count2++;
+                                       total_in_this_set++;
                                }
                                else break;
                        }
@@ -5679,13 +6957,15 @@ int InspIRCd(void)
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
                        {
                                result = EAGAIN;
-                               if (FD_ISSET (count2a->second->fd, &sfd))
+                               if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
                                {
+                                       log(DEBUG,"Reading fd %d",count2a->second->fd);
                                        memset(data, 0, 10240);
                                        result = read(count2a->second->fd, data, 10240);
                                        
                                        if (result)
                                        {
+                                               log(DEBUG,"Read %d characters from socket",result);
                                                userrec* current = count2a->second;
                                                int currfd = current->fd;
                                                char* l = strtok(data,"\n");