]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Added ability to update routing table on the fly if a connection is lost
[user/henk/code/inspircd.git] / src / inspircd.cpp
index b74ef4d7fdc02fd8e80183bdc57d923e8295ed9f..f178a9f0b0d549e68f1b6d2826d6b135f761429a 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 = 0;
 
 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;
@@ -150,7 +149,6 @@ typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp
 typedef std::deque<command_t> command_table;
 
 serverrec* me[32];
-serverrec* servers[255];
 
 FILE *log_file;
 
@@ -184,6 +182,7 @@ char* Passwd(userrec *user);
 bool IsDenied(userrec *user);
 void AddWhoWas(userrec* u);
 
+std::vector<long> auth_cookies;
 std::stringstream config_f(stringstream::in | stringstream::out);
 
 void safedelete(userrec *p)
@@ -730,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++)
                {
@@ -850,6 +849,132 @@ 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,const 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))
+                       {
+                               log(DEBUG,"%s is common to %s sharing with %s",i->second->nick,servername,u->nick);
+                               return true;
+                       }
+               }
+       }
+       return false;
+}
+
+
+void NetSendToCommon(userrec* u, char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s);
+
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str()))
+                               {
+                                       me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                               }
+                       }
+               }
+       }
+}
+
+
+void NetSendToAll(char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToAll: '%s'",s);
+
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                       }
+               }
+       }
+}
+
+
+void NetSendToOne(char* target,char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToOne: '%s' '%s'",target,s);
+
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+                               {
+                                       me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                               }
+                       }
+               }
+       }
+}
+
+void NetSendToAllExcept(char* target,char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
+       
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+                               {
+                                       me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                               }
+                       }
+               }
+       }
+}
+
+
 bool hasumode(userrec* user, char mode)
 {
        if (user)
@@ -912,7 +1037,31 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
        }
 }
 
-void WriteWallOps(userrec *source, char* text, ...)  
+void ChangeName(userrec* user, const char* gecos)
+{
+       strncpy(user->fullname,gecos,MAXBUF);
+
+       // TODO: replace these with functions:
+       // NetSendToAll - to all
+       // NetSendToCommon - to all that hold users sharing a common channel with another user
+       // NetSendToOne - to one server
+       // NetSendToAllExcept - send to all but one
+       // all by servername
+
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
+       NetSendToAll(buffer);
+}
+
+void ChangeDisplayedHost(userrec* user, const char* host)
+{
+       strncpy(user->dhost,host,160);
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"b %s :%s",user->nick,host);
+       NetSendToAll(buffer);
+}
+
+void WriteWallOps(userrec *source, bool local_only, char* text, ...)  
 {  
        if ((!text) || (!source))
        {
@@ -932,11 +1081,18 @@ void WriteWallOps(userrec *source, char* text, ...)
                if (i->second)
                {
                        if (strchr(i->second->modes,'w'))
-                       {  
+                       {
                                WriteTo(source,i->second,"WALLOPS %s",textbuffer);
                        }
                 }
        }
+
+       if (!local_only)
+       {
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer);
+               NetSendToAll(buffer);
+       }
 }  
 
 /* convert a string to lowercase. Note following special circumstances
@@ -971,7 +1127,6 @@ void strlower(char *n)
 
 int isident(const char* n)
 {
-        int i = 0;
         char v[MAXBUF];
         if (!n)
 
@@ -982,7 +1137,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))
                 {
@@ -1014,7 +1169,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))
                {
@@ -1129,7 +1284,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))
                {
@@ -1236,8 +1391,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))
                {
@@ -1393,10 +1547,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
        // 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';
@@ -1443,17 +1593,16 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                Ptr = FindChan(cname);
                if (Ptr)
                {
-                       FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
-                       if (MOD_RESULT) {
-                               return NULL;
-                       }
-                       
                        log(DEBUG,"add_channel: joining to: %s",Ptr->name);
                        
                        // the override flag allows us to bypass channel modes
                        // and bans (used by servers)
                        if (!override)
                        {
+                               FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+                               if (MOD_RESULT) {
+                                       return NULL;
+                               }
                                
                                if (strcmp(Ptr->key,""))
                                {
@@ -1505,22 +1654,37 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                log(DEBUG,"add_channel: about to walk banlist");
        
                                /* check user against the channel banlist */
-                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                               if (Ptr)
                                {
-                                       if (match(user->GetFullHost(),i->data))
+                                       if (Ptr->bans.size())
                                        {
-                                               WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
-                                               return NULL;
+                                               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: bans checked");
+                               
 
-                       log(DEBUG,"add_channel: bans checked");
+                               if ((Ptr) && (user))
+                               {
+                                       user->RemoveInvite(Ptr->name);
+                               }
+       
+                               log(DEBUG,"add_channel: invites removed");
 
-                       user->RemoveInvite(Ptr->name);
+                       }
+                       else
+                       {
+                               log(DEBUG,"Overridden checks");
+                       }
 
-                       log(DEBUG,"add_channel: invites removed");
                        
                }
                created = 1;
@@ -1528,11 +1692,12 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 
        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) 
                        {
@@ -1545,6 +1710,14 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                        }
                        user->chans[i].channel = Ptr;
                        WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
+                       
+                       if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it.
+                       {
+                               // use the stamdard J token with no privilages.
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
+                               NetSendToAll(buffer);
+                       }
 
                        log(DEBUG,"Sent JOIN to client");
 
@@ -1569,7 +1742,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 /* remove a channel from a users record, and remove the record from memory
  * if the channel has become empty */
 
-chanrec* del_channel(userrec *user, const char* cname, const char* reason)
+chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
 {
        if ((!user) || (!cname))
        {
@@ -1577,7 +1750,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason)
                return NULL;
        }
 
-       int i = 0;
        chanrec* Ptr;
        int created = 0;
 
@@ -1596,7 +1768,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)
@@ -1604,9 +1776,25 @@ 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);
+                                       NetSendToAll(buffer);
+                               }
+
+                               
                        }
                        else
                        {
+                               if (!local)
+                               {
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
+                                       NetSendToAll(buffer);
+                               }
+                       
                                WriteChannel(Ptr,user,"PART :%s",Ptr->name);
                        }
                        user->chans[i].uc_modes = 0;
@@ -1671,10 +1859,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;
@@ -1706,14 +1895,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)
                {
@@ -1733,8 +1920,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;
        }
@@ -1742,30 +1930,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;
@@ -1801,9 +1995,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)
                                        {
@@ -1812,6 +2007,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;
                                }
                        }
                }
@@ -1849,9 +2045,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)
                                        {
@@ -1860,6 +2057,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;
                                }
                        }
                }
@@ -1877,8 +2075,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;
        }
@@ -1887,19 +2086,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)
                                        {
@@ -1908,8 +2110,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;
@@ -1945,9 +2149,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)
                                        {
@@ -1956,6 +2161,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;
                                }
                        }
                }
@@ -1993,9 +2199,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)
                                        {
@@ -2004,6 +2211,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;
                                }
                        }
                }
@@ -2107,7 +2315,7 @@ int take_ban(userrec *user,char *dest,chanrec *chan,int status)
        return 0;
 }
 
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent)
+void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
 {
        if (!parameters) {
                log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
@@ -2130,7 +2338,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
@@ -2181,13 +2389,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)
@@ -2490,15 +2702,36 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        strcat(outstr," ");
                        strcat(outstr,outpars[ptr]);
                }
-               if (servermode)
+               if (local)
                {
-                       if (!silent)
-                               WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+                       log(DEBUG,"Local mode change");
+                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
                }
                else
                {
-                       if (!silent)
-                               WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
+                       if (servermode)
+                       {
+                               if (!silent)
+                               {
+                                       WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
+                                       // M token for a usermode must go to all servers
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
+                                       NetSendToAll(buffer);
+                               }
+                                       
+                       }
+                       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);
+                                       NetSendToAll(buffer);
+                               }
+                       }
                }
        }
 }
@@ -2553,14 +2786,15 @@ 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 = true;
+       userrec* s2;
+       bool faked = false;
        if (!source)
        {
-               strncpy(s2.nick,ServerName,NICKMAX);
-               strcpy(s2.modes,"o");
-               s2.fd = -1;
-               source = &s2;
+               s2 = new userrec;
+               strncpy(s2->nick,ServerName,NICKMAX);
+               strcpy(s2->modes,"o");
+               s2->fd = -1;
+               source = s2;
                faked = true;
        }
        string_list p;
@@ -2577,14 +2811,19 @@ 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;
        }
 }
@@ -2599,6 +2838,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);
@@ -2635,7 +2879,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] == '+')
                        {
@@ -2766,6 +3010,11 @@ 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);
+                       NetSendToAll(buffer);
+
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -2800,6 +3049,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;
                        }
                }
 
@@ -2809,7 +3059,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        return;
                }
 
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false);
+               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
        }
        else
        {
@@ -2849,7 +3099,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] == '+')
                        {
@@ -2975,6 +3225,11 @@ 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);
+                       NetSendToAll(buffer);
+                       
                        if (strlen(dmodes)>MAXMODES)
                        {
                                dmodes[MAXMODES-1] = '\0';
@@ -2991,7 +3246,7 @@ void server_mode(char **parameters, int pcnt, userrec *user)
        Ptr = FindChan(parameters[0]);
        if (Ptr)
        {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false);
+               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
        }
        else
        {
@@ -3030,7 +3285,7 @@ void merge_mode(char **parameters, int pcnt)
                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] == '+')
                        {
@@ -3174,91 +3429,273 @@ void merge_mode(char **parameters, int pcnt)
                strncpy(s2.nick,ServerName,NICKMAX);
                strcpy(s2.modes,"o");
                s2.fd = -1;
-               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true);
+               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
        }
 }
 
 
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot, #darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+void merge_mode2(char **parameters, int pcnt, userrec* user)
 {
-       char plist[MAXBUF];
-       char *param;
-       char *pars[32];
-       char blog[32][MAXBUF];
-       char blog2[32][MAXBUF];
-       int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
-       char keystr[MAXBUF];
-       char moo[MAXBUF];
-
-       for (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])
-       {
-               return 0;
-       }
-       if (!strchr(parameters[start],','))
-       {
-               return 0;
-       }
-       strcpy(plist,"");
-       for (i = start; i <= end; i++)
+       if ((dest) && (pcnt > 1))
        {
-               if (parameters[i])
-               {
-                       strcat(plist,parameters[i]);
-               }
-       }
-       
-       j = 0;
-       param = plist;
+               log(DEBUG,"params > 1");
 
-       t = strlen(plist);
-       for (i = 0; i < t; i++)
-       {
-               if (plist[i] == ',')
+               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++)
                {
-                       plist[i] = '\0';
-                       strcpy(blog[j++],param);
-                       param = plist+i+1;
-                       if (j>20)
+                       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 (int i = start; i <= end; i++)
+       {
+               if (parameters[i])
+               {
+                       strcat(plist,parameters[i]);
+               }
+       }
+       
+       j = 0;
+       param = plist;
+
+       t = strlen(plist);
+       for (int i = 0; i < t; i++)
+       {
+               if (plist[i] == ',')
+               {
+                       plist[i] = '\0';
+                       strcpy(blog[j++],param);
+                       param = plist+i+1;
+                       if (j>20)
                        {
                                WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
                                return 1;
@@ -3280,7 +3717,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] == ',')
                                {
@@ -3364,13 +3801,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);
        }
 }
 
@@ -3390,10 +3827,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)
                {
@@ -3404,8 +3842,15 @@ 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);
+       NetSendToAll(buffer);
 }
 
 
@@ -3462,6 +3907,11 @@ 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);
+               NetSendToAll(buffer);
        }
 
        /* push the socket on a stack of sockets due to be closed at the next opportunity
@@ -3489,8 +3939,6 @@ void kill_link(userrec *user,const char* r)
        if (user->registered == 7) {
                purge_empty_chans();
        }
-       
-       client_exit = 1;
 }
 
 
@@ -3502,11 +3950,36 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
         log(DEBUG,"kill: %s %s",parameters[0],parameters[1]);
        if (u)
        {
-               WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]);
-               // :Brain!brain@NetAdmin.chatspike.net KILL [Brain] :homer!NetAdmin.chatspike.net!Brain (test kill)
-               WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
-               sprintf(killreason,"Killed (%s (%s))",user->nick,parameters[1]);
-               kill_link(u,killreason);
+               if (strcmp(ServerName,u->server))
+               {
+                       // remote kill
+                       WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
+                       sprintf(killreason,"[%s] Killed (%s (%s))",ServerName,user->nick,parameters[1]);
+                       WriteCommonExcept(u,"QUIT :%s",killreason);
+                       // K token must go to ALL servers!!!
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"K %s %s :%s",user->nick,u->nick,killreason);
+                       NetSendToAll(buffer);
+                       
+                       user_hash::iterator iter = clientlist.find(u->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();
+               }
+               else
+               {
+                       // local kill
+                       WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]);
+                       WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
+                       sprintf(killreason,"Killed (%s (%s))",user->nick,parameters[1]);
+                       kill_link(u,killreason);
+               }
        }
        else
        {
@@ -3610,6 +4083,11 @@ 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);
+       NetSendToAll(buffer);
 }
 
 void handle_topic(char **parameters, int pcnt, userrec *user)
@@ -3664,6 +4142,11 @@ 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);
+                               NetSendToAll(buffer);
                        }
                        else
                        {
@@ -3708,9 +4191,10 @@ void Error(int status)
 }
 
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
        Start();
+       srand(time(NULL));
        log(DEBUG,"*** InspIRCd starting up!");
        if (!FileExists(CONFIG_FILE))
        {
@@ -3894,6 +4378,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");
 }
@@ -3917,7 +4407,6 @@ void handle_names(char **parameters, int pcnt, userrec *user)
        }
 }
 
-
 void handle_privmsg(char **parameters, int pcnt, userrec *user)
 {
        userrec *dest;
@@ -3951,6 +4440,11 @@ 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]);
+                       NetSendToCommon(user,buffer);
                }
                else
                {
@@ -3975,8 +4469,20 @@ 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
+               {
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
+                       NetSendToOne(dest->server,buffer);
+               }
        }
        else
        {
@@ -4017,7 +4523,12 @@ 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]);
+                       NetSendToCommon(user,buffer);
                }
                else
                {
@@ -4037,7 +4548,17 @@ 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
+               {
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
+                       NetSendToOne(dest->server,buffer);
+               }
        }
        else
        {
@@ -4059,7 +4580,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)
                {
@@ -4155,6 +4676,13 @@ 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);
+       NetSendToAll(buffer);
+}
+
 void handle_quit(char **parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = clientlist.find(user->nick);
@@ -4179,12 +4707,20 @@ 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]);
+                       NetSendToAll(buffer);
                }
                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);
+                       NetSendToAll(buffer);
                }
                FOREACH_MOD OnUserQuit(user);
                AddWhoWas(user);
@@ -4195,18 +4731,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)
@@ -4287,7 +4821,7 @@ void handle_who(char **parameters, int pcnt, userrec *user)
 
 void handle_wallops(char **parameters, int pcnt, userrec *user)
 {
-       WriteWallOps(user,"%s",parameters[0]);
+       WriteWallOps(user,false,"%s",parameters[0]);
 }
 
 void handle_list(char **parameters, int pcnt, userrec *user)
@@ -4355,23 +4889,45 @@ int usercount_unknown(void)
        return c;
 }
 
-int chancount(void)
+long chancount(void)
 {
        return chanlist.size();
 }
 
-int servercount(void)
+long count_servs(void)
 {
-       return 1;
+       int c = 0;
+       //for (int j = 0; j < 255; j++)
+       //{
+       //      if (servers[j] != NULL)
+       //              c++;
+       //}
+       return c;
+}
+
+long servercount(void)
+{
+       return count_servs()+1;
+}
+
+long local_count()
+{
+       int c = 0;
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+       }
+       return c;
 }
 
+
 void handle_lusers(char **parameters, int pcnt, userrec *user)
 {
        WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,usercnt()-usercount_invisible(),usercount_invisible(),servercount());
        WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
        WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
        WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
-       WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,usercnt());
+       WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),count_servs());
 }
 
 void handle_admin(char **parameters, int pcnt, userrec *user)
@@ -4440,6 +4996,10 @@ 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);
+       NetSendToAll(buffer);
 }
 
 void handle_version(char **parameters, int pcnt, userrec *user)
@@ -4582,7 +5142,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)
                {
@@ -4616,6 +5176,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)
@@ -4727,14 +5309,18 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
        
        for (int i = 0; i < ConfValueEnum("link",&config_f); i++)
        {
-               ConfValue("link","name",i,Link_ServerName,&config_f);
-               ConfValue("link","ipaddr",i,Link_IPAddr,&config_f);
-               ConfValue("link","port",i,Link_Port,&config_f);
-               ConfValue("link","sendpass",i,Link_Pass,&config_f);
-               log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass);
-               LinkPort = atoi(Link_Port);
-               if (match(Link_ServerName,parameters[0])) {
-                       found = true;
+               if (!found)
+               {
+                       ConfValue("link","name",i,Link_ServerName,&config_f);
+                       ConfValue("link","ipaddr",i,Link_IPAddr,&config_f);
+                       ConfValue("link","port",i,Link_Port,&config_f);
+                       ConfValue("link","sendpass",i,Link_Pass,&config_f);
+                       log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass);
+                       LinkPort = atoi(Link_Port);
+                       if (match(Link_ServerName,parameters[0])) {
+                               found = true;
+                               break;
+                       }
                }
        }
        
@@ -4749,23 +5335,8 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
 
        if (me[defaultRoute])
        {
-
-               // at this point parameters[0] is an ip in a string.
-               // TODO: Look this up from the <link> blocks instead!
-               for (int j = 0; j < 255; j++) {
-                       if (servers[j] == NULL) {
-                               servers[j] = new serverrec;
-                               strcpy(servers[j]->internal_addr,Link_IPAddr);
-                               strcpy(servers[j]->name,Link_ServerName);
-                               log(DEBUG,"Allocated new serverrec");
-                               if (!me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass))
-                               {
-                                       WriteServ(user->fd,"NOTICE %s :*** Failed to send auth packet to %s!",user->nick,Link_IPAddr);
-                               }
-                               return;
-                       }
-               }
-               WriteServ(user->fd,"NOTICE %s :*** Failed to create server record for address %s!",user->nick,Link_IPAddr);
+               me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass,Link_ServerName);
+               return;
        }
        else
        {
@@ -4778,6 +5349,79 @@ 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(const char* s)
+{
+       char c = '`';
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
+                               {
+                                       c = '|';
+                               }
+                               if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
+                               {
+                                       c = '`';
+                               }
+                       }
+               }
+       }
+       return c;
+}
+
+long map_count(const char* s)
+{
+       int c = 0;
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) 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 < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,me[j]->connectors[k].GetServerName().c_str(),ServerName,me[j]->connectors[k].GetDescription().c_str());
+                       }
+               }
+       }
+       WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick);
+}
+
+void handle_map(char **parameters, int pcnt, userrec *user)
+{
+       char line[MAXBUF];
+       snprintf(line,MAXBUF,"006 %s :%s",user->nick,ServerName);
+       while (strlen(line) < 50)
+               strcat(line," ");
+       WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(me[j]->connectors[k].GetServerName().c_str()),me[j]->connectors[k].GetServerName().c_str());
+                               while (strlen(line) < 50)
+                                       strcat(line," ");
+                               WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(me[j]->connectors[k].GetServerName().c_str()),(float)(((float)map_count(me[j]->connectors[k].GetServerName().c_str())/(float)usercnt())*100));
+                       }
+               }
+       }
+       WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
+}
+
+
 void handle_oper(char **parameters, int pcnt, userrec *user)
 {
        char LoginName[MAXBUF];
@@ -4787,7 +5431,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);
@@ -4805,7 +5449,7 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
                                {
                                        /* found this oper's opertype */
                                        ConfValue("type","host",j,Hostname,&config_f);
-                                       strncpy(user->dhost,Hostname,256);
+                                       ChangeDisplayedHost(user,Hostname);
                                }
                        }
                        if (!strchr(user->modes,'o'))
@@ -4877,6 +5521,12 @@ 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]);
+               NetSendToAll(buffer);
+               
        }
        
        /* change the nick of the user in the users_hash */
@@ -4953,7 +5603,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] == ' ')
                {
@@ -5019,10 +5669,21 @@ void process_command(userrec *user, char* cmd)
        
        strcpy(temp,cmd);
 
-       string tmp = cmd;
-       FOREACH_MOD OnServerRaw(tmp,true);
-       const char* cmd2 = tmp.c_str();
-       snprintf(cmd,512,"%s",cmd2);
+       std::string tmp = cmd;
+       for (int i = 0; i <= MODCOUNT; i++)
+       {
+               std::string oldtmp = tmp;
+               modules[i]->OnServerRaw(tmp,true);
+               if (oldtmp != tmp)
+               {
+                       log(DEBUG,"A Module changed the input string!");
+                       log(DEBUG,"New string: %s",tmp.c_str());
+                       log(DEBUG,"Old string: %s",oldtmp.c_str());
+                       break;
+               }
+       }
+       strncpy(cmd,tmp.c_str(),MAXBUF);
+       strcpy(temp,cmd);
 
        if (!strchr(cmd,' '))
        {
@@ -5044,7 +5705,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))
                        {
@@ -5058,7 +5719,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]);
@@ -5074,7 +5735,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]);
                        }
@@ -5104,7 +5765,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,""))
                {
@@ -5262,6 +5923,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)
@@ -5307,60 +5970,174 @@ void process_buffer(const char* cmdbuf,userrec *user)
        }
 }
 
-void DoSync(serverrec* serv, char* udp_host,int udp_port, long MyKey)
+void DoSync(serverrec* serv, char* udp_host)
 {
        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);
+       serv->SendPacket(data,udp_host);
        // 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);
-               serv->SendPacket(data,udp_host,udp_port,MyKey);
+               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);
                if (strcmp(chlist(u->second),""))
                {
                        snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second));
-                       serv->SendPacket(data,udp_host,udp_port,MyKey);
+                       serv->SendPacket(data,udp_host);
                }
        }
        // send channel modes, topics etc...
        for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
        {
                snprintf(data,MAXBUF,"M %s +%s",c->second->name,chanmodes(c->second));
-               serv->SendPacket(data,udp_host,udp_port,MyKey);
+               serv->SendPacket(data,udp_host);
                if (strcmp(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);
                }
-               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 %s +b %s",b->set_time,c->second->name,b->data);
-                       serv->SendPacket(data,udp_host,udp_port,MyKey);
+                       serv->SendPacket(data,udp_host);
                }
        }
        // send end of sync marker: E <timestamp>
        snprintf(data,MAXBUF,"F %d",time(NULL));
-       serv->SendPacket(data,udp_host,udp_port,MyKey);
+       serv->SendPacket(data,udp_host);
+       // ircd sends its serverlist after the end of sync here
+}
+
+
+void handle_V(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       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)
+{
+       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)
+{
+       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_M(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+void handle_t(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       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)
+{
+       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)
 {
        char* pars[128];
        char original[MAXBUF],target[MAXBUF];
        strncpy(original,params,MAXBUF);
        int index = 0;
-       char* parameter = strtok(NULL," ");
+       char* parameter = strtok(params," ");
        strncpy(target,parameter,MAXBUF);
        while (parameter)
        {
                pars[index++] = parameter;
                parameter = strtok(NULL," ");
        }
-       merge_mode(pars,--index);
+       merge_mode(pars,index);
        if (FindChan(target))
        {
                WriteChannelLocal(FindChan(target), NULL, "MODE %s",original);
@@ -5371,7 +6148,164 @@ void handle_M(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
-void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+// 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)
+{
+       // 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)
+{
+       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_K(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       char* src = strtok(params," ");
+       char* nick = strtok(NULL," :");
+       char* reason = strtok(NULL,"\r\n");
+       char kreason[MAXBUF];
+       reason++;
+
+       userrec* u = Find(nick);
+       userrec* user = Find(src);
+       
+       if ((user) && (u))
+       {
+               WriteTo(user, u, "KILL %s :%s!%s!%s!%s (%s)", u->nick, source->name, ServerName, user->dhost,user->nick,reason);
+               WriteOpers("*** Remote kill from %s by %s: %s!%s@%s (%s)",source->name,user->nick,u->nick,u->ident,u->host,reason);
+               snprintf(kreason,MAXBUF,"[%s] Killed (%s (%s))",source->name,user->nick,reason);
+               kill_link(u,kreason);
+       }
+}
+
+void handle_Q(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       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)
+{
+       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)
+{
+       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_AT(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       char* who = strtok(params," :");
+       char* text = strtok(NULL,"\r\n");
+       text++;
+       userrec* s = Find(who);
+       if (s)
+       {
+               WriteWallOps(s,true,text);
+       }
+}
+
+
+void handle_N(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
 {
        char* tm = strtok(params," ");
        char* nick = strtok(NULL," ");
@@ -5382,6 +6316,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        char* server = strtok(NULL," :");
        char* gecos = strtok(NULL,"\r\n");
        gecos++;
+       modes++;
        time_t TS = atoi(tm);
        user_hash::iterator iter = clientlist.find(nick);
        if (iter != clientlist.end())
@@ -5406,7 +6341,7 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        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]->ident, ident,10); // +1 char to compensate for tilde
        strncpy(clientlist[nick]->fullname, gecos,128);
        clientlist[nick]->signon = TS;
        clientlist[nick]->nping = 0; // this is ignored for a remote user anyway.
@@ -5414,9 +6349,66 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        clientlist[nick]->port = 0; // so is this...
        clientlist[nick]->registered = 7; // this however we need to set for them to receive messages and appear online
        clientlist[nick]->idle_lastmsg = time(NULL); // this is unrealiable and wont actually be used locally
+       for (int i = 0; i < MAXCHANS; i++)
+       {
+               clientlist[nick]->chans[i].channel = NULL;
+               clientlist[nick]->chans[i].uc_modes = 0;
+       }
+}
+
+void handle_F(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       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)
+void handle_a(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       char* nick = strtok(params," :");
+       char* gecos = strtok(NULL,"\r\n");
+       
+       userrec* user = Find(nick);
+
+       if (user)
+               strncpy(user->fullname,gecos,MAXBUF);
+}
+
+void handle_b(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       char* nick = strtok(params," :");
+       char* host = strtok(NULL,"\r\n");
+       
+       userrec* user = Find(nick);
+
+       if (user)
+               strncpy(user->dhost,host,160);
+}
+
+void handle_plus(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       // %s %s %d %d
+       // + test3.chatspike.net 7010 -2016508415
+       char* servername = strtok(params," ");
+       char* ipaddr = strtok(NULL," ");
+       char* ipport = strtok(NULL," ");
+       char* cookie = strtok(NULL," ");
+       log(DEBUG," ");
+       log(DEBUG," ");
+       log(DEBUG,"*** Connecting back to %s:%d",ipaddr,atoi(ipport));
+       me[defaultRoute]->MeshCookie(ipaddr,atoi(ipport),atoi(cookie),servername);
+       log(DEBUG," ");
+}
+
+void handle_R(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       char* server = strtok(params," ");
+       char* data = strtok(NULL,"\r\n");
+       log(DEBUG,"Forwarded packet '%s' to '%s'",data,server);
+       NetSendToOne(server,data);
+}
+
+void handle_J(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
 {
        // IMPORTANT NOTE
        // The J token currently has no timestamp - this needs looking at
@@ -5457,7 +6449,7 @@ void handle_J(char token,char* params,serverrec* source,serverrec* reply, char*
                                                if (privilage == '+')
                                                {
                                                        user->chans[i].uc_modes = user->chans[i].uc_modes | UCMODE_VOICE;
-                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +o %s",channel,user->nick);
+                                                       WriteChannelLocal(user->chans[i].channel, NULL, "MODE %s +v %s",channel,user->nick);
                                                }
                                        }
                                }
@@ -5468,36 +6460,226 @@ void handle_J(char token,char* params,serverrec* source,serverrec* reply, char*
        }
 }
 
-void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
+void NetSendMyRoutingTable()
 {
+       // send out a line saying what is reachable to us.
+       // E.g. if A is linked to B C and D, send out:
+       // $ A B C D
+       // if its only linked to B and D send out:
+       // $ A B D
+       // if it has no links, dont even send out the line at all.
+       char buffer[MAXBUF];
+       sprintf(buffer,"$ %s",ServerName);
+       bool sendit = false;
+       for (int i = 0; i < 32; i++)
+       {
+               if (me[i] != NULL)
+               {
+                       for (int j = 0; j < me[i]->connectors.size(); j++)
+                       {
+                               if (me[i]->connectors[j].GetState() != STATE_DISCONNECTED)
+                               {
+                                       strncat(buffer," ",MAXBUF);
+                                       strncat(buffer,me[i]->connectors[j].GetServerName().c_str(),MAXBUF);
+                                       sendit = true;
+                               }
+                       }
+               }
+       }
+       if (sendit)
+               NetSendToAll(buffer);
+}
+
+void handle_dollar(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       log(DEBUG,"Storing routing table...");
+       char* sourceserver = strtok(params," ");
+       char* server = strtok(NULL," ");
+       for (int i = 0; i < 32; i++)
+       {
+               if (me[i] != NULL)
+               {
+                       for (int j = 0; j < me[i]->connectors.size(); j++)
+                       {
+                               if (!strcasecmp(me[i]->connectors[j].GetServerName().c_str(),sourceserver))
+                               {
+                                       me[i]->connectors[j].routes.clear();
+                                       log(DEBUG,"Found entry for source server.");
+                                       while (server)
+                                       {
+                                               // store each route
+                                               me[i]->connectors[j].routes.push_back(server);
+                                               log(DEBUG,"*** Stored route: %s -> %s -> %s",ServerName,sourceserver,server);
+                                               server = strtok(NULL," ");
+                                       }
+                                       return;
+                               }
+                       }
+               }
+       }
+       log(DEBUG,"Warning! routing table received from nonexistent server!");
+}
+
+
+void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,char* ipaddr,int port)
+{
+       long authcookie = rand()*rand();
+       char buffer[MAXBUF];
+
        switch(token)
        {
                // Y <TS>
                // start netburst
                case 'Y':
+                       nb_start = time(NULL);
+                       WriteOpers("Server %s is starting netburst.",udp_host);
+                       // now broadcast this new servers address out to all servers that are linked to us,
+                       // except the newcomer. They'll all attempt to connect back to it.
+
+                       // give the server its authcookie.
+                       snprintf(buffer,MAXBUF,"~ %d",authcookie);
+                       source->SendPacket(buffer,udp_host);
+                       // tell all the other servers to use this authcookie to connect back again
+                       // got '+ test3.chatspike.net 7010 -2016508415' from test.chatspike.net
+                       snprintf(buffer,MAXBUF,"+ %s %s %d %d",udp_host,ipaddr,port,authcookie);
+                       NetSendToAllExcept(udp_host,buffer);
+               break;
+               // ~
+               // Store authcookie
+               // once stored, this authcookie permits other servers to log in
+               // without user or password, using it.
+               case '~':
+                       auth_cookies.push_back(atoi(params));
+                       log(DEBUG,"*** Stored auth cookie, will permit servers with auth-cookie %d",atoi(params));
+               break;
+               // connect back to a server using an authcookie
+               case '+':
+                       handle_plus(token,params,source,reply,udp_host);
+               break;
+               // routing table
+               case '$':
+                       handle_dollar(token,params,source,reply,udp_host);
+               break;
+               // R <server> <data>
+               // redirect token, send all of <data> along to the given 
+               // server as this server has been found to still have a route to it
+               case 'R':
+                       handle_R(token,params,source,reply,udp_host);
+               break;
+               // ?
+               // ping
+               case '?':
+                       reply->SendPacket("!",udp_host);
+               break;
+               // ?
+               // pong
+               case '!':
+               break;
+               // *
+               // no operation
+               case '*':
                break;
                // N <TS> <NICK> <HOST> <DHOST> <IDENT> <MODES> <SERVER> :<GECOS>
                // introduce remote client
                case 'N':
-                       handle_N(token,params,source,reply,udp_host,udp_port);
+                       handle_N(token,params,source,reply,udp_host);
+               break;
+               // a <NICK> :<GECOS>
+               // change GECOS (SETNAME)
+               case 'a':
+                       handle_a(token,params,source,reply,udp_host);
+               break;
+               // b <NICK> :<HOST>
+               // change displayed host (SETHOST)
+               case 'b':
+                       handle_b(token,params,source,reply,udp_host);
+               break;
+               // t <NICK> <CHANNEL> :<TOPIC>
+               // change a channel topic
+               case 't':
+                       handle_t(token,params,source,reply,udp_host);
+               break;
+               // i <NICK> <CHANNEL>
+               // invite a user to a channel
+               case 'i':
+                       handle_i(token,params,source,reply,udp_host);
+               break;
+               // k <SOURCE> <DEST> <CHANNEL> :<REASON>
+               // kick a user from a channel
+               case 'k':
+                       handle_k(token,params,source,reply,udp_host);
+               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);
                break;
                // J <NICK> <CHANLIST>
                // Join user to channel list, merge channel permissions
                case 'J':
-                       handle_J(token,params,source,reply,udp_host,udp_port);
+                       handle_J(token,params,source,reply,udp_host);
                break;
-               // T <TS> <CHANNEL> <TOPICSETTER> <TOPIC>
+               // T <TS> <CHANNEL> <TOPICSETTER> :<TOPIC>
                // change channel topic (netburst only)
                case 'T':
+                       handle_T(token,params,source,reply,udp_host);
                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);
+                       handle_M(token,params,source,reply,udp_host);
+               break;
+               // m <SOURCE> <TARGET> <MODES> [MODE-PARAMETERS]
+               // User setting modes on an object
+               case 'm':
+                       handle_m(token,params,source,reply,udp_host);
+               break;
+               // P <SOURCE> <TARGET> :<TEXT>
+               // Send a private/channel message
+               case 'P':
+                       handle_P(token,params,source,reply,udp_host);
+               break;
+               // V <SOURCE> <TARGET> :<TEXT>
+               // Send a private/channel notice
+               case 'V':
+                       handle_V(token,params,source,reply,udp_host);
+               break;
+               // L <SOURCE> <CHANNEL> :<REASON>
+               // User parting a channel
+               case 'L':
+                       handle_L(token,params,source,reply,udp_host);
+               break;
+               // Q <SOURCE> :<REASON>
+               // user quitting
+               case 'Q':
+                       handle_Q(token,params,source,reply,udp_host);
+               break;
+               // K <SOURCE> <DEST> :<REASON>
+               // remote kill
+               case 'K':
+                       handle_K(token,params,source,reply,udp_host);
+               break;
+               // @ <SOURCE> :<TEXT>
+               // wallops
+               case '@':
+                       handle_AT(token,params,source,reply,udp_host);
                break;
                // F <TS>
                // end netburst
                case 'F':
+                       WriteOpers("Server %s has completed netburst. (%d secs)",udp_host,time(NULL)-nb_start);
+                       handle_F(token,params,source,reply,udp_host);
+                       nb_start = 0;
+               break;
+               // X <reserved>
+               // Send netburst now
+               case 'X':
+                       WriteOpers("Sending my netburst to %s",udp_host);
+                       DoSync(source,udp_host);
+                       WriteOpers("Send of netburst to %s completed",udp_host);
+                       NetSendMyRoutingTable();
                break;
                // anything else
                default:
@@ -5507,7 +6689,7 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
 }
 
 
-void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_port, serverrec *serv)
+void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
 {
        char response[10240];
        char token = udp_msg[0];
@@ -5517,12 +6699,59 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
        if (strstr(params," :")) {
                strncpy(finalparam,strstr(params," :"),1024);
        }
+       if (token == '-') {
+               char* cookie = strtok(params," ");
+               char* servername = strtok(NULL," ");
+               char* serverdesc = finalparam+2;
+               WriteOpers("AuthCookie CONNECT from %s (%s)",servername,udp_host);
+               for (int u = 0; u < auth_cookies.size(); u++)
+               {
+                       if (auth_cookies[u] == atoi(cookie))
+                       {
+                               WriteOpers("Allowed cookie from %s, is now part of the mesh",servername);
+
+
+                               for (int j = 0; j < 32; j++)
+                               {
+                                       if (me[j] != NULL)
+                                       {
+                                               for (int k = 0; k < me[j]->connectors.size(); k++)
+                                               {
+                                                       if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
+                                                       {
+                                                               me[j]->connectors[k].SetServerName(servername);
+                                                               NetSendMyRoutingTable();
+                                                               return;
+                                                       }
+                                               }
+                                       }
+                                       WriteOpers("\2WARNING!\2 %s sent us an authentication packet but we are not authenticating with this server right now! Possible intrusion attempt!",udp_host);
+                                       return;
+                               }
+
+
+                               return;
+                       }
+               }
+               // bad cookie, bad bad! go sit in the corner!
+               WriteOpers("Bad cookie from %s!",servername);
+               return;
+       }
+       else
        if (token == 'S') {
                // S test.chatspike.net password :ChatSpike InspIRCd test server
                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);
+               
+               for (int j = 0; j < serv->connectors.size(); j++)
+               {
+                       if (!strcasecmp(serv->connectors[j].GetServerName().c_str(),udp_host))
+                       {
+                               serv->connectors[j].SetServerName(servername);
+                       }
+               }
                
                
                char Link_ServerName[1024];
@@ -5542,62 +6771,22 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                        ConfValue("link","sendpass",i,Link_SendPass,&config_f);
                        log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass);
                        LinkPort = atoi(Link_Port);
-                       if (!strcasecmp(Link_ServerName,servername)) {
-                               if (!strcasecmp(Link_IPAddr,udp_host)) {
-                                       if (LinkPort == udp_port) {
-                                               // we have a matching link line -
-                                               // send a 'diminutive' server message back...
-                                               snprintf(response,10240,"s %s %s :%s",ServerName,Link_SendPass,ServerDesc);
-                                               serv->SendPacket(response,udp_host,udp_port,0);
-                                               WriteOpers("CONNECT from %s accepted, authenticating",servername);
-                                               for (int j = 0; j < 255; j++) {
-                                                       if (servers[j] == NULL) {
-                                                               servers[j] = new serverrec;
-                                                               strcpy(servers[j]->internal_addr,udp_host);
-                                                               strcpy(servers[j]->name,servername);
-                                                               // create a server record for this server
-                                                               snprintf(response,10240,"O %d",MyKey);
-                                                               serv->SendPacket(response,udp_host,udp_port,0);
-                                                               return;
-                                                       }
-                                               }
-                                               WriteOpers("Internal error connecting to %s, failed to create server record!",servername);
-                                               return;
-                                       }
-                                       else {
-                                               log(DEBUG,"Port numbers '%d' and '%d' don't match",LinkPort,udp_port);
-                                       }
-                               }
-                               else {
-                                       log(DEBUG,"IP Addresses '%s' and '%s' don't match",Link_IPAddr,udp_host);
-                               }
-                       }
-                       else {
-                               log(DEBUG,"Server names '%s' and '%s' don't match",Link_ServerName,servername);
+                       if (!strcasecmp(Link_ServerName,servername))
+                       {
+                               // we have a matching link line -
+                               // send a 'diminutive' server message back...
+                               snprintf(response,10240,"s %s %s :%s",ServerName,Link_SendPass,ServerDesc);
+                               serv->SendPacket(response,servername);
+                               return;
                        }
                }
-               serv->SendPacket("E :Access is denied (no matching link block)",udp_host,udp_port,0);
+               char buffer[MAXBUF];
+               sprintf(buffer,"E :Access is denied (no matching link block)");
+               serv->SendPacket(buffer,udp_host);
                WriteOpers("CONNECT from %s denied, no matching link block",servername);
                return;
        }
        else
-       if (token == 'O') {
-               // if this is received, this means the server-ip that sent it said "OK" to credentials.
-               // only when a server says this do we exchange keys. The server MUST have an entry in the servers
-               // array, which is only added by an 'S' packet or BeginLink().
-               for (int i = 0; i < 255; i++) {
-                       if (servers[i] != NULL) {
-                               if (!strcasecmp(servers[i]->internal_addr,udp_host)) {
-                                       servers[i]->key = atoi(params);
-                                       log(DEBUG,"Key for this server is now %d",servers[i]->key);
-                                       DoSync(serv,udp_host,udp_port,MyKey);
-                                       return;
-                               }
-                       }
-               }
-               WriteOpers("\2WARNING!\2 Server ip %s attempted a key exchange, but is not in the authentication state! Possible intrusion attempt!",udp_host);
-       }
-       else
        if (token == 's') {
                // S test.chatspike.net password :ChatSpike InspIRCd test server
                char* servername = strtok(params," ");
@@ -5632,39 +6821,39 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                        ConfValue("link","sendpass",i,Link_SendPass,&config_f);
                        log(DEBUG,"(%d) Comparing against name='%s', ipaddr='%s', port='%s', recvpass='%s'",i,Link_ServerName,Link_IPAddr,Link_Port,Link_Pass);
                        LinkPort = atoi(Link_Port);
-                       if (!strcasecmp(Link_ServerName,servername)) {
-                               if (!strcasecmp(Link_IPAddr,udp_host)) {
-                                       if (LinkPort == udp_port) {
-                                               // matching link at this end too, we're all done!
-                                               // at this point we must begin key exchange and insert this
-                                               // server into our 'active' table.
-                                               for (int j = 0; j < 255; j++) {
-                                                       if (servers[j] != NULL) {
-                                                               if (!strcasecmp(servers[j]->internal_addr,udp_host)) {
-                                                                       WriteOpers("Server %s authenticated, exchanging server keys...",servername);
-                                                                       snprintf(response,10240,"O %d",MyKey);
-                                                                       serv->SendPacket(response,udp_host,udp_port,0);
-                                                                       return;
-                                                               }
+                       if (!strcasecmp(Link_ServerName,servername))
+                       {
+                               // matching link at this end too, we're all done!
+                               // at this point we must begin key exchange and insert this
+                               // server into our 'active' table.
+                               for (int j = 0; j < 32; j++)
+                               {
+                                       if (me[j] != NULL)
+                                       {
+                                               for (int k = 0; k < me[j]->connectors.size(); k++)
+                                               {
+                                                       if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
+                                                       {
+                                                               char buffer[MAXBUF];
+                                                               sprintf(buffer,"X 0");
+                                                               serv->SendPacket(buffer,udp_host);
+                                                               DoSync(me[j],udp_host);
+                                                               NetSendMyRoutingTable();
+                                                               return;
                                                        }
                                                }
-                                               WriteOpers("\2WARNING!\2 %s sent us an authentication packet but we are not authenticating with this server right noe! Possible intrusion attempt!",udp_host);
-                                               return;
-
-                                       }
-                                       else {
-                                               log(DEBUG,"Port numbers '%d' and '%d' don't match",LinkPort,udp_port);
                                        }
-                               }
-                               else {
-                                       log(DEBUG,"IP Addresses '%s' and '%s' don't match",Link_IPAddr,udp_host);
+                                       WriteOpers("\2WARNING!\2 %s sent us an authentication packet but we are not authenticating with this server right noe! Possible intrusion attempt!",udp_host);
+                                       return;
                                }
                        }
                        else {
                                log(DEBUG,"Server names '%s' and '%s' don't match",Link_ServerName,servername);
                        }
                }
-               serv->SendPacket("E :Access is denied (no matching link block)",udp_host,udp_port,0);
+               char buffer[MAXBUF];
+               sprintf(buffer,"E :Access is denied (no matching link block)");
+               serv->SendPacket(buffer,udp_host);
                WriteOpers("CONNECT from %s denied, no matching link block",servername);
                return;
        }
@@ -5673,34 +6862,33 @@ void handle_link_packet(long theirkey, char* udp_msg, char* udp_host, int udp_po
                char* error_message = finalparam+2;
                WriteOpers("ERROR from %s: %s",udp_host,error_message);
                // remove this server from any lists
-               for (int j = 0; j < 255; j++) {
-                       if (servers[j] != NULL) {
-                               if (!strcasecmp(servers[j]->internal_addr,udp_host)) {
-                                       delete servers[j];
-                                       return;
-                               }
-                       }
-               }
                return;
        }
        else {
 
                serverrec* source_server = NULL;
 
-               for (int j = 0; j < 255; j++) {
-                       if (servers[j] != NULL) {
-                               if (!strcasecmp(servers[j]->internal_addr,udp_host)) {
-                                       if (servers[j]->key == theirkey) {
-                                               // found a valid key for this server, can process restricted stuff here
-                                               process_restricted_commands(token,params,servers[j],serv,udp_host,udp_port);
-                                               log(DEBUG,"Sync: exit 2");
+               for (int j = 0; j < 32; j++)
+               {
+                       if (me[j] != NULL)
+                       {
+                               for (int x = 0; x < me[j]->connectors.size(); x++)
+                               {
+                                       log(DEBUG,"Servers are: '%s' '%s'",udp_host,me[j]->connectors[x].GetServerName().c_str());
+                                       if (!strcasecmp(me[j]->connectors[x].GetServerName().c_str(),udp_host))
+                                       {
+                                               log(DEBUG,"match! process restricted stuff here");
+                                               // found a valid ircd_connector.
+                                               // TODO: Fix this so it only lets servers in that are in the 
+                                               // STATE_CONNECTED state!!!
+                                               process_restricted_commands(token,params,me[j],serv,udp_host,me[j]->connectors[x].GetServerIP(),me[j]->connectors[x].GetServerPort());
                                                return;
                                        }
                                }
                        }
                }
 
-               log(DEBUG,"Unrecognised token or unauthenticated host in datagram from %s:%d: %c",udp_host,udp_port,token);
+               log(DEBUG,"Unrecognised token or unauthenticated host in datagram from %s: %c",udp_host,token);
        }
 }
 
@@ -5879,8 +7067,8 @@ int InspIRCd(void)
                return (ERROR);
        }
        
+
        length = sizeof (client);
-       int flip_flop = 0, udp_port = 0;
        char udp_msg[MAXBUF], udp_host[MAXBUF];
          
        /* main loop, this never returns */
@@ -5888,14 +7076,14 @@ int InspIRCd(void)
        {
 
                fd_set sfd;
-               struct timeval tval;
+               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 (reap_counter>2500)
                {
                        if (fd_reap.size() > 0)
                        {
@@ -5909,28 +7097,67 @@ int InspIRCd(void)
                        fd_reap.clear();
                        reap_counter=0;
                }
+               reap_counter++;
 
-     
+               fd_set serverfds;
+               FD_ZERO(&serverfds);
+               timeval tvs;
+               
                for (int x = 0; x != UDPportCount; x++)
                {
-                       long theirkey = 0;
-                       if (me[x]->RecvPacket(udp_msg, udp_host, udp_port, theirkey))
+                       FD_SET(me[x]->fd, &serverfds);
+               }
+               
+               tvs.tv_usec = 0;                
+               tvs.tv_sec = 0;
+               
+               int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
+               if (servresult > 0)
+               {
+                       for (int x = 0; x != UDPportCount; x++)
                        {
-                               if (strlen(udp_msg)<1) {
-                               log(DEBUG,"Invalid datagram from %s:%d:%d [route%d]",udp_host,udp_port,me[x]->port,x);
+                               if (FD_ISSET (me[x]->fd, &serverfds))
+                               {
+                                       char remotehost[MAXBUF],resolved[MAXBUF];
+                                       length = sizeof (client);
+                                       incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length);
+                                       strncpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF);
+                                       if(CleanAndResolve(resolved, remotehost) != TRUE)
+                                       {
+                                               strncpy(resolved,remotehost,MAXBUF);
+                                       }
+                                       // add to this connections ircd_connector vector
+                                       me[x]->AddIncoming(incomingSockfd,resolved,ntohs(client.sin_port));
+                               }
                        }
-                       else
+               }
+     
+               for (int x = 0; x < UDPportCount; x++)
+               {
+                       std::deque<std::string> msgs;
+                       msgs.clear();
+                       if (me[x]->RecvPacket(msgs, udp_host))
                        {
-                               FOREACH_MOD OnPacketReceive(udp_msg);
-                               // Packets must go back via the route they arrived on :)
-                               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");
+                               for (int ctr = 0; ctr < msgs.size(); ctr++)
+                               {
+                                       char udp_msg[MAXBUF];
+                                       strncpy(udp_msg,msgs[ctr].c_str(),MAXBUF);
+                                       if (strlen(udp_msg)<1)
+                                               {
+                                               log(DEBUG,"Invalid string from %s [route%d]",udp_host,x);
+                                               break;
+                                       }
+                                       // during a netburst, send all data to all other linked servers
+                                       if ((nb_start>0) && (udp_msg[0] != 'Y') && (udp_msg[0] != 'X') && (udp_msg[0] != 'F'))
+                                       {
+                                               NetSendToAllExcept(udp_host,udp_msg);
+                                       }
+                                       FOREACH_MOD OnPacketReceive(udp_msg);
+                                       handle_link_packet(udp_msg, udp_host, me[x]);
+                               }
                                goto label;
                        }
                }
-       }
        
 
        while (count2 != clientlist.end())
@@ -6111,18 +7338,7 @@ int InspIRCd(void)
                FD_SET (openSockfd[count], &selectFds);
        }
 
-       /* added timeout! select was waiting forever... wank... :/ */
-       tv.tv_usec = 0;
-
-       flip_flop++;
-       reap_counter++;
-       if (flip_flop > 20)
-       {
-               tv.tv_usec = 1;
-               flip_flop = 0;
-       }
-       
-       tv.tv_sec = 0;
+       tv.tv_usec = 1;
        selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
 
        /* select is reporting a waiting socket. Poll them all to find out which */
@@ -6133,6 +7349,7 @@ int InspIRCd(void)
                {
                        if (FD_ISSET (openSockfd[count], &selectFds))
                        {
+                               length = sizeof (client);
                                incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length);
                              
                                address_cache::iterator iter = IP.find(client.sin_addr);