]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
/WHO and routing fixes
[user/henk/code/inspircd.git] / src / inspircd.cpp
index a0633957de26375b0c66c2fb02ce7f1ac5a5d471..1398ec90c131795f9d7ea595b17849dfdf2272c9 100644 (file)
@@ -41,6 +41,8 @@ using namespace std;
 #include <errno.h>
 #include <deque>
 #include <errno.h>
+#include <unistd.h>
+#include <sched.h>
 #include "connection.h"
 #include "users.h"
 #include "servers.h"
@@ -49,6 +51,8 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
+#include "message.h"
+#include "mode.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -76,7 +80,7 @@ int WHOWAS_MAX = 100;  // default 100 people maximum in the WHOWAS list
 int DieDelay  =  5;
 time_t startup_time = time(NULL);
 int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops
-time_t nb_start = time(NULL);
+time_t nb_start = 0;
 
 extern vector<Module*> modules;
 std::vector<std::string> module_names;
@@ -149,7 +153,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;
 
@@ -183,109 +186,21 @@ 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)
-{
-       if (p)
-       {
-               log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
-               log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
-               delete p;
-               p = NULL;
-       }
-       else
-       {
-               log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished");
-       }
-}
-
-void safedelete(chanrec *p)
-{
-       if (p)
-       {
-               delete p;
-               p = NULL;
-               log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
-       }
-       else
-       {
-               log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished");
-       }
-}
-
-
-void tidystring(char* str)
-{
-       // strips out double spaces before a : parameter
-       
-       char temp[MAXBUF];
-       bool go_again = true;
-       
-       if (!str)
-       {
-               return;
-       }
-       
-       while ((str[0] == ' ') && (strlen(str)>0))
-       {
-               str++;
-       }
-       
-       while (go_again)
-       {
-               bool noparse = false;
-               int t = 0, a = 0;
-               go_again = false;
-               while (a < strlen(str))
-               {
-                       if ((a<strlen(str)-1) && (noparse==false))
-                       {
-                               if ((str[a] == ' ') && (str[a+1] == ' '))
-                               {
-                                       log(DEBUG,"Tidied extra space out of string: %s",str);
-                                       go_again = true;
-                                       a++;
-                               }
-                       }
-                       
-                       if (a<strlen(str)-1)
-                       {
-                               if ((str[a] == ' ') && (str[a+1] == ':'))
-                               {
-                                       noparse = true;
-                               }
-                       }
-                       
-                       temp[t++] = str[a++];
-               }
-               temp[t] = '\0';
-               strncpy(str,temp,MAXBUF);
-       }
-}
 
-/* chop a string down to 512 characters and preserve linefeed (irc max
- * line length) */
 
-void chop(char* str)
+long GetRevision()
 {
-  if (!str)
-  {
-       log(DEBUG,"ERROR! Null string passed to chop()!");
-       return;
-  }
-  string temp = str;
-  FOREACH_MOD OnServerRaw(temp,false);
-  const char* str2 = temp.c_str();
-  sprintf(str,"%s",str2);
-  
-
-  if (strlen(str) >= 512)
-  {
-       str[509] = '\r';
-       str[510] = '\n';
-       str[511] = '\0';
-  }
+       char Revision[] = "$Revision$";
+       char *s1 = Revision;
+       char *savept;
+       char *v1 = strtok_r(s1," ",&savept);
+       s1 = savept;
+       char *v2 = strtok_r(s1," ",&savept);
+       s1 = savept;
+       return (long)(atof(v2)*10000);
 }
 
 
@@ -457,42 +372,6 @@ void ReadConfig(void)
   }
 }
 
-void Blocking(int s)
-{
-  int flags;
-  log(DEBUG,"Blocking: %d",s);
-  flags = fcntl(s, F_GETFL, 0);
-  fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void NonBlocking(int s)
-{
-  int flags;
-  log(DEBUG,"NonBlocking: %d",s);
-  flags = fcntl(s, F_GETFL, 0);
-  //fcntl(s, F_SETFL, O_NONBLOCK);
-  fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
-
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
-{
-  struct hostent *hostPtr = NULL;
-  struct in_addr addr;
-
-  memset (resolvedHost, '\0',MAXBUF);
-  if(unresolvedHost == NULL)
-       return(ERROR);
-  if ((inet_aton(unresolvedHost,&addr)) == 0)
-       return(ERROR);
-  hostPtr = gethostbyaddr ((char *)&addr.s_addr,sizeof(addr.s_addr),AF_INET);
-  if (hostPtr != NULL)
-       snprintf(resolvedHost,MAXBUF,"%s",hostPtr->h_name);
-  else
-       snprintf(resolvedHost,MAXBUF,"%s",unresolvedHost);
-  return (TRUE);
-}
-
 /* write formatted text to a socket, in same format as printf */
 
 void Write(int sock,char *text, ...)
@@ -706,48 +585,26 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
        }
 }
 
-int c_count(userrec* u)
-{
-       int z = 0;
-       for (int i =0; i != MAXCHANS; i++)
-               if (u->chans[i].channel != NULL)
-                       z++;
-       return z;
-
-}
-
-/* return 0 or 1 depending if users u and u2 share one or more common channels
- * (used by QUIT, NICK etc which arent channel specific notices) */
 
-int common_channels(userrec *u, userrec *u2)
+std::string GetServerDescription(char* servername)
 {
-       int i = 0;
-       int z = 0;
-
-       if ((!u) || (!u2))
+       for (int j = 0; j < 32; j++)
        {
-               log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
-               return 0;
-       }
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               for (z = 0; z != MAXCHANS; z++)
+               if (me[j] != NULL)
                {
-                       if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
                        {
-                               if ((u->chans[i].channel == u2->chans[z].channel) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7))
+                               if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername))
                                {
-                                       if ((c_count(u)) && (c_count(u2)))
-                                       {
-                                               return 1;
-                                       }
+                                       return me[j]->connectors[k].GetDescription();
                                }
                        }
                }
+               return ServerDesc; // not a remote server that can be found, it must be me.
        }
-       return 0;
 }
 
+
 /* write a formatted string to all users who share at least one common
  * channel, including the source user e.g. for use in NICK */
 
@@ -869,7 +726,7 @@ bool ChanAnyOnThisServer(chanrec *c,char* servername)
 
 // returns true if user 'u' shares any common channels with any users on server 'servername'
 
-bool CommonOnThisServer(userrec* u,char* servername)
+bool CommonOnThisServer(userrec* u,const char* servername)
 {
        log(DEBUG,"ChanAnyOnThisServer");
        for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
@@ -878,6 +735,7 @@ bool CommonOnThisServer(userrec* u,char* servername)
                {
                        if (!strcasecmp(i->second->server,servername))
                        {
+                               log(DEBUG,"%s is common to %s sharing with %s",i->second->nick,servername,u->nick);
                                return true;
                        }
                }
@@ -886,16 +744,120 @@ bool CommonOnThisServer(userrec* u,char* servername)
 }
 
 
+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());
+                               }
+                       }
+               }
+       }
+}
+
 
-bool hasumode(userrec* user, char mode)
+void NetSendToAll(char* s)
 {
-       if (user)
+       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 NetSendToAllAlive(char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToAllAlive: '%s'",s);
+
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED)
+                               {
+                                       me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                               }
+                               else
+                               {
+                                       log(DEBUG,"%s is dead, not sending to it.",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(const 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++)
        {
-               return (strchr(user->modes,mode)>0);
+               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());
+                               }
+                       }
+               }
        }
-       else return false;
 }
 
+
 void WriteMode(const char* modes, int flags, const char* text, ...)
 {
        if ((!text) || (!modes) || (!flags))
@@ -949,41 +911,6 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
        }
 }
 
-void ChangeName(userrec* user, const char* gecos)
-{
-       strncpy(user->fullname,gecos,MAXBUF);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-               {
-                       if (strcmp(servers[j]->name,ServerName))
-                       {
-                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                               log(DEBUG,"Sent a token");
-                       }
-               }
-       }
-}
-
-void ChangeDisplayedHost(userrec* user, const char* host)
-{
-       strncpy(user->dhost,host,160);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"b %s :%s",user->nick,host);
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-               {
-                       if (strcmp(servers[j]->name,ServerName))
-                       {
-                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                               log(DEBUG,"Sent b token");
-                       }
-               }
-       }
-}
 
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)  
 {  
@@ -1015,17 +942,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
        {
                char buffer[MAXBUF];
                snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer);
-               for (int j = 0; j < 255; j++)
-               {
-                       if (servers[j] != NULL)
-                       {
-                               if (strcmp(servers[j]->name,ServerName))
-                               {
-                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       log(DEBUG,"Sent @ token");
-                               }
-                       }
-               }
+               NetSendToAll(buffer);
        }
 }  
 
@@ -1057,71 +974,7 @@ void strlower(char *n)
        }
 }
 
-/* verify that a user's ident and nickname is valid */
-
-int isident(const char* n)
-{
-        char v[MAXBUF];
-        if (!n)
-
-        {
-                return 0;
-        }
-        if (!strcmp(n,""))
-        {
-                return 0;
-        }
-        for (int i = 0; i != strlen(n); i++)
-        {
-                if ((n[i] < 33) || (n[i] > 125))
-                {
-                        return 0;
-                }
-                /* can't occur ANYWHERE in an Ident! */
-                if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
-                {
-                        return 0;
-                }
-        }
-        return 1;
-}
-
 
-int isnick(const char* n)
-{
-       int i = 0;
-       char v[MAXBUF];
-       if (!n)
-       {
-               return 0;
-       }
-       if (!strcmp(n,""))
-       {
-               return 0;
-       }
-       if (strlen(n) > NICKMAX-1)
-       {
-               return 0;
-       }
-       for (int i = 0; i != strlen(n); i++)
-       {
-               if ((n[i] < 33) || (n[i] > 125))
-               {
-                       return 0;
-               }
-               /* can't occur ANYWHERE in a nickname! */
-               if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
-               {
-                       return 0;
-               }
-               /* can't occur as the first char of a nickname... */
-               if ((strchr("0123456789",n[i])) && (!i))
-               {
-                       return 0;
-               }
-       }
-       return 1;
-}
 
 /* Find a user record by nickname and return a pointer to it */
 
@@ -1205,39 +1058,6 @@ void purge_empty_chans(void)
        log(DEBUG,"completed channel purge, killed %d",purge);
 }
 
-/* returns the status character for a given user on a channel, e.g. @ for op,
- * % for halfop etc. If the user has several modes set, the highest mode
- * the user has must be returned. */
-
-char* cmode(userrec *user, chanrec *chan)
-{
-       if ((!user) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
-               return "";
-       }
-
-       int i;
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
-               {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
-                       {
-                               return "@";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return "%";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
-                       {
-                               return "+";
-                       }
-                       return "";
-               }
-       }
-}
 
 char scratch[MAXBUF];
 char sparam[MAXBUF];
@@ -1313,39 +1133,6 @@ char* chanmodes(chanrec *chan)
        return scratch;
 }
 
-/* returns the status value for a given user on a channel, e.g. STATUS_OP for
- * op, STATUS_VOICE for voice etc. If the user has several modes set, the
- * highest mode the user has must be returned. */
-
-int cstatus(userrec *user, chanrec *chan)
-{
-       if ((!chan) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** cstatus was given an invalid parameter");
-               return 0;
-       }
-
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
-               {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
-                       {
-                               return STATUS_OP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return STATUS_HOP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
-                       {
-                               return STATUS_VOICE;
-                       }
-                       return STATUS_NORMAL;
-               }
-       }
-}
-
 
 /* compile a userlist of a channel into a string, each nick seperated by
  * spaces and op, voice etc status shown as @ and + */
@@ -1650,14 +1437,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                // use the stamdard J token with no privilages.
                                char buffer[MAXBUF];
                                snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
-                               for (int j = 0; j < 255; j++)
-                               {
-                                       if (servers[j] != NULL)
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                               log(DEBUG,"Sent J token");
-                                       }
-                               }
+                               NetSendToAll(buffer);
                        }
 
                        log(DEBUG,"Sent JOIN to client");
@@ -1722,14 +1502,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                                {
                                        char buffer[MAXBUF];
                                        snprintf(buffer,MAXBUF,"L %s %s :%s",user->nick,Ptr->name,reason);
-                                       for (int j = 0; j < 255; j++)
-                                       {
-                                               if (servers[j] != NULL)
-                                               {
-                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                                       log(DEBUG,"Sent L token (with reason)");
-                                               }
-                                       }
+                                       NetSendToAll(buffer);
                                }
 
                                
@@ -1740,14 +1513,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                                {
                                        char buffer[MAXBUF];
                                        snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
-                                       for (int j = 0; j < 255; j++)
-                                       {
-                                               if (servers[j] != NULL)
-                                               {
-                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                                       log(DEBUG,"Sent L token (no reason)");
-                                               }
-                                       }
+                                       NetSendToAll(buffer);
                                }
                        
                                WriteChannel(Ptr,user,"PART :%s",Ptr->name);
@@ -1846,1770 +1612,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 }
 
 
-/* returns 1 if user u has channel c in their record, 0 if not */
-
-int has_channel(userrec *u, chanrec *c)
-{
-       if ((!u) || (!c))
-       {
-               log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
-               return 0;
-       }
-       for (int i =0; i != MAXCHANS; i++)
-       {
-               if (u->chans[i].channel == c)
-               {
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-int give_ops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
-               return 0;
-       }
-       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;
-       }
-       else
-       {
-               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 (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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;
-}
-
-int give_hops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
-               return 0;
-       }
-       if (status != STATUS_OP)
-       {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       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;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int give_voice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_HOP)
-       {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       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;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int take_ops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
-               return 0;
-       }
-       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;
-       }
-       else
-       {
-               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 (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       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;
-}
-
-int take_hops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
-               return 0;
-       }
-       if (status != STATUS_OP)
-       {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_HOP;
-                                       log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int take_voice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_HOP)
-       {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               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)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_VOICE;
-                                       log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-void TidyBan(char *ban)
-{
-       if (!ban) {
-               log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter");
-               return;
-       }
-       
-       char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF];
-
-       strcpy(temp,ban);
-
-       char* pos_of_pling = strchr(temp,'!');
-       char* pos_of_at = strchr(temp,'@');
-
-       pos_of_pling[0] = '\0';
-       pos_of_at[0] = '\0';
-       pos_of_pling++;
-       pos_of_at++;
-
-       strncpy(NICK,temp,NICKMAX);
-       strncpy(IDENT,pos_of_pling,IDENTMAX+1);
-       strncpy(HOST,pos_of_at,160);
-
-       sprintf(ban,"%s!%s@%s",NICK,IDENT,HOST);
-}
-
-int add_ban(userrec *user,char *dest,chanrec *chan,int status)
-{
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** add_ban was given an invalid parameter");
-               return 0;
-       }
-
-       BanItem b;
-       if ((!user) || (!dest) || (!chan))
-               return 0;
-       if (strchr(dest,'!')==0)
-               return 0;
-       if (strchr(dest,'@')==0)
-               return 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] < 32)
-                       return 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] > 126)
-                       return 0;
-       int c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '!')
-                       c++;
-       if (c>1)
-               return 0;
-       c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '@')
-                       c++;
-       if (c>1)
-               return 0;
-       log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
-
-       TidyBan(dest);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data,dest))
-               {
-                       // dont allow a user to set the same ban twice
-                       return 0;
-               }
-       }
-
-       b.set_time = time(NULL);
-       strncpy(b.data,dest,MAXBUF);
-       strncpy(b.set_by,user->nick,NICKMAX);
-       chan->bans.push_back(b);
-       return 1;
-}
-
-int take_ban(userrec *user,char *dest,chanrec *chan,int status)
-{
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** take_ban was given an invalid parameter");
-               return 0;
-       }
-
-       log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data,dest))
-               {
-                       chan->bans.erase(i);
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-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");
-               return;
-       }
-
-       char modelist[MAXBUF];
-       char outlist[MAXBUF];
-       char outstr[MAXBUF];
-       char outpars[32][MAXBUF];
-       int param = 2;
-       int pc = 0;
-       int ptr = 0;
-       int mdir = 1;
-       int r = 0;
-       bool k_set = false, l_set = false;
-
-       if (pcnt < 2)
-       {
-               return;
-       }
-
-       log(DEBUG,"process_modes: start: parameters=%d",pcnt);
-
-       strcpy(modelist,parameters[1]); /* mode list, e.g. +oo-o */
-                                       /* parameters[2] onwards are parameters for
-                                        * modes that require them :) */
-       strcpy(outlist,"+");
-       mdir = 1;
-
-       log(DEBUG,"process_modes: modelist: %s",modelist);
-
-       for (ptr = 0; ptr < strlen(modelist); ptr++)
-       {
-               r = 0;
-
-               {
-                       log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
-                       char modechar = modelist[ptr];
-                       switch (modelist[ptr])
-                       {
-                               case '-':
-                                       if (mdir != 0)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '-';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"-");
-                                               }
-                                       }
-                                       mdir = 0;
-                                       
-                               break;                  
-
-                               case '+':
-                                       if (mdir != 1)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '+';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"+");
-                                               }
-                                       }
-                                       mdir = 1;
-                               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)
-                                       {
-                                               strcat(outlist,"o");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                       
-                               case 'h':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = give_hops(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_hops(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"h");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                       
-                               
-                               case 'v':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = give_voice(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_voice(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"v");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                               
-                               case 'b':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = add_ban(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_ban(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"b");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-
-
-                               case 'k':
-                                       if ((param >= pcnt))
-                                               break;
-
-                                       if (mdir == 1)
-                                       {
-                                               if (k_set)
-                                                       break;
-                                               
-                                               if (!strcmp(chan->key,""))
-                                               {
-                                                       strcat(outlist,"k");
-                                                       char key[MAXBUF];
-                                                       strcpy(key,parameters[param++]);
-                                                       if (strlen(key)>32) {
-                                                               key[31] = '\0';
-                                                       }
-                                                       strcpy(outpars[pc++],key);
-                                                       strcpy(chan->key,key);
-                                                       k_set = true;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               /* checks on -k are case sensitive and only accurate to the
-                                                  first 32 characters */
-                                               char key[MAXBUF];
-                                               strcpy(key,parameters[param++]);
-                                               if (strlen(key)>32) {
-                                                       key[31] = '\0';
-                                               }
-                                               /* only allow -k if correct key given */
-                                               if (!strcmp(chan->key,key))
-                                               {
-                                                       strcat(outlist,"k");
-                                                       strcpy(chan->key,"");
-                                                       strcpy(outpars[pc++],key);
-                                               }
-                                       }
-                               break;
-                               
-                               case 'l':
-                                       if (mdir == 0)
-                                       {
-                                               if (chan->limit)
-                                               {
-                                                       strcat(outlist,"l");
-                                                       chan->limit = 0;
-                                               }
-                                       }
-                                       
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               if (l_set)
-                                                       break;
-                                               
-                                               bool invalid = false;
-                                               for (int i = 0; i < strlen(parameters[param]); i++)
-                                               {
-                                                       if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
-                                                       {
-                                                               invalid = true;
-                                                       }
-                                               }
-                                               if (atoi(parameters[param]) < 1)
-                                               {
-                                                       invalid = true;
-                                               }
-
-                                               if (invalid)
-                                                       break;
-                                               
-                                               chan->limit = atoi(parameters[param]);
-                                               if (chan->limit)
-                                               {
-                                                       strcat(outlist,"l");
-                                                       strcpy(outpars[pc++],parameters[param++]);
-                                                       l_set = true;
-                                               }
-                                       }
-                               break;
-                               
-                               case 'i':
-                                       if (chan->inviteonly != mdir)
-                                       {
-                                               strcat(outlist,"i");
-                                       }
-                                       chan->inviteonly = mdir;
-                               break;
-                               
-                               case 't':
-                                       if (chan->topiclock != mdir)
-                                       {
-                                               strcat(outlist,"t");
-                                       }
-                                       chan->topiclock = mdir;
-                               break;
-                               
-                               case 'n':
-                                       if (chan->noexternal != mdir)
-                                       {
-                                               strcat(outlist,"n");
-                                       }
-                                       chan->noexternal = mdir;
-                               break;
-                               
-                               case 'm':
-                                       if (chan->moderated != mdir)
-                                       {
-                                               strcat(outlist,"m");
-                                       }
-                                       chan->moderated = mdir;
-                               break;
-                               
-                               case 's':
-                                       if (chan->secret != mdir)
-                                       {
-                                               strcat(outlist,"s");
-                                               if (chan->c_private)
-                                               {
-                                                       chan->c_private = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strcat(outlist,"-p+");
-                                                       }
-                                                       else
-                                                       {
-                                                               strcat(outlist,"+p-");
-                                                       }
-                                               }
-                                       }
-                                       chan->secret = mdir;
-                               break;
-                               
-                               case 'p':
-                                       if (chan->c_private != mdir)
-                                       {
-                                               strcat(outlist,"p");
-                                               if (chan->secret)
-                                               {
-                                                       chan->secret = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strcat(outlist,"-s+");
-                                                       }
-                                                       else
-                                                       {
-                                                               strcat(outlist,"+s-");
-                                                       }
-                                               }
-                                       }
-                                       chan->c_private = mdir;
-                               break;
-                               
-                               default:
-                                       log(DEBUG,"Preprocessing custom mode %c",modechar);
-                                       string_list p;
-                                       p.clear();
-                                       if (((!strchr(chan->custom_modes,modechar)) && (!mdir)) || ((strchr(chan->custom_modes,modechar)) && (mdir)))
-                                       {
-                                               log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
-                                               break;
-                                       }
-                                       if (ModeDefined(modechar,MT_CHANNEL))
-                                       {
-                                               log(DEBUG,"A module has claimed this mode");
-                                               if (param<pcnt)
-                                               {
-                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                                       if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                               }
-                                               bool handled = false;
-                                               if (param>=pcnt)
-                                               {
-                                                       log(DEBUG,"Not enough parameters for module-mode %c",modechar);
-                                                       // we're supposed to have a parameter, but none was given... so dont handle the mode.
-                                                       if (((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))) 
-                                                       {
-                                                               handled = true;
-                                                               param++;
-                                                       }
-                                               }
-                                               for (int i = 0; i <= MODCOUNT; i++)
-                                               {
-                                                       if (!handled)
-                                                       {
-                                                               if (modules[i]->OnExtendedMode(user,chan,modechar,MT_CHANNEL,mdir,p))
-                                                               {
-                                                                       log(DEBUG,"OnExtendedMode returned nonzero for a module");
-                                                                       char app[] = {modechar, 0};
-                                                                       if (ptr>0)
-                                                                       {
-                                                                               if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
-                                                                               {
-                                                                                       strcat(outlist, app);
-                                                                               }
-                                                                               else if (!strchr(outlist,modechar))
-                                                                               {
-                                                                                       strcat(outlist, app);
-                                                                               }
-                                                                       }
-                                                                       chan->SetCustomMode(modechar,mdir);
-                                                                       // include parameters in output if mode has them
-                                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                                       {
-                                                                               chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
-                                                                               strcpy(outpars[pc++],parameters[param++]);
-                                                                       }
-                                                                       // break, because only one module can handle the mode.
-                                                                       handled = true;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               break;
-                               
-                       }
-               }
-       }
-
-       /* this ensures only the *valid* modes are sent out onto the network */
-       while ((outlist[strlen(outlist)-1] == '-') || (outlist[strlen(outlist)-1] == '+'))
-       {
-               outlist[strlen(outlist)-1] = '\0';
-       }
-       if (strcmp(outlist,""))
-       {
-               strcpy(outstr,outlist);
-               for (ptr = 0; ptr < pc; ptr++)
-               {
-                       strcat(outstr," ");
-                       strcat(outstr,outpars[ptr]);
-               }
-               if (local)
-               {
-                       log(DEBUG,"Local mode change");
-                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
-               }
-               else
-               {
-                       if (servermode)
-                       {
-                               if (!silent)
-                               {
-                                       WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
-                                       for (int j = 0; j < 255; j++)
-                                       {
-                                               if (servers[j] != NULL)
-                                               {
-                                                       if (strcmp(servers[j]->name,ServerName))
-                                                       {
-                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                                               log(DEBUG,"Sent M token");
-                                                       }
-                                               }
-                                       }
-                               }
-                                       
-                       }
-                       else
-                       {
-                               if (!silent)
-                               {
-                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
-                                       for (int j = 0; j < 255; j++)
-                                       {
-                                               if (servers[j] != NULL)
-                                               {
-                                                       if (strcmp(servers[j]->name,ServerName))
-                                                       {
-                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                                               log(DEBUG,"Sent m token");
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-// based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
-
-bool allowed_umode(char umode, char* sourcemodes,bool adding)
-{
-       log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
-       // RFC1459 specified modes
-       if ((umode == 'w') || (umode == 's') || (umode == 'i'))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       
-       // user may not +o themselves or others, but an oper may de-oper other opers or themselves
-       if ((strchr(sourcemodes,'o')) && (!adding))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       else if (umode == 'o')
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return false;
-       }
-       
-       // process any module-defined modes that need oper
-       if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
-       {
-               log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
-               return true;
-       }
-       else
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               // process any module-defined modes that don't need oper
-               log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
-               if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
-               {
-                       // no, this mode needs oper, and this user 'aint got what it takes!
-                       return false;
-               }
-               return true;
-       }
-
-       // anything else - return false.
-       log(DEBUG,"umode %c not known by any ruleset",umode);
-       return false;
-}
-
-bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
-{
-       userrec* s2;
-       bool faked = false;
-       if (!source)
-       {
-               s2 = new userrec;
-               strncpy(s2->nick,ServerName,NICKMAX);
-               strcpy(s2->modes,"o");
-               s2->fd = -1;
-               source = s2;
-               faked = true;
-       }
-       string_list p;
-       p.clear();
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               for (int i = 0; i <= MODCOUNT; i++)
-               {
-                       if (modules[i]->OnExtendedMode(source,(void*)dest,umode,MT_CLIENT,adding,p))
-                       {
-                               log(DEBUG,"Module claims umode %c",umode);
-                               return true;
-                       }
-               }
-               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;
-       }
-}
-
-void handle_mode(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-
-       if (!user)
-       {
-               return;
-       }
-
-       if ((dest) && (pcnt == 1))
-       {
-               WriteServ(user->fd,"221 %s :+%s",user->nick,user->modes);
-               return;
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-               log(DEBUG,"pulled up dest user modes: %s",dmodes);
-       
-               can_change = 0;
-               if (user != dest)
-               {
-                       if (strchr(user->modes,'o'))
-                       {
-                               can_change = 1;
-                       }
-               }
-               else
-               {
-                       can_change = 1;
-               }
-               if (!can_change)
-               {
-                       WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
-                       return;
-               }
-               
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               can_change = 0;
-                               if (strchr(user->modes,'o'))
-                               {
-                                       can_change = 1;
-                               }
-                               else
-                               {
-                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
-                                       {
-                                               can_change = 1;
-                                       }
-                               }
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, 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
-                                       {
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, 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 :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (strcmp(servers[j]->name,ServerName))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                               log(DEBUG,"Sent m token");
-                                       }
-                               }
-                       }
-
-                       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 (pcnt == 1)
-               {
-                       /* just /modes #channel */
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
-                       WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                       return;
-               }
-               else
-               if (pcnt == 2)
-               {
-                       if ((!strcmp(parameters[1],"+b")) || (!strcmp(parameters[1],"b")))
-                       {
-
-                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                               {
-                                       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;
-                       }
-               }
-
-               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
-               {
-                       WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
-                       return;
-               }
-
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-
-void server_mode(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"server_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, 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, user, 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 :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (strcmp(servers[j]->name,ServerName))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                               log(DEBUG,"Sent m token");
-                                       }
-                               }
-                       }
-                       
-                       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)
-       {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-void merge_mode(char **parameters, int pcnt)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"merge_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],"o",false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               userrec s2;
-               strncpy(s2.nick,ServerName,NICKMAX);
-               strcpy(s2.modes,"o");
-               s2.fd = -1;
-               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
-       }
-}
-
-
-void merge_mode2(char **parameters, int pcnt, userrec* user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"merge_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user,dest,"MODE :%s",b);
-
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
-               {
-                       return;
-               }
-
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
-       }
-}
-
 
 
 /* This function pokes and hacks at a parameter list like the following:
@@ -3846,15 +1848,7 @@ void handle_kick(char **parameters, int pcnt, userrec *user)
        
        char buffer[MAXBUF];
        snprintf(buffer,MAXBUF,"k %s %s %s :%s",user->nick,u->nick,Ptr->name,reason);
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-               {
-                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                       log(DEBUG,"Sent k token");
-               }
-       }
-       
+       NetSendToAll(buffer);
 }
 
 
@@ -3915,17 +1909,7 @@ void kill_link(userrec *user,const char* r)
                // Q token must go to ALL servers!!!
                char buffer[MAXBUF];
                snprintf(buffer,MAXBUF,"Q %s :%s",user->nick,reason);
-               for (int j = 0; j < 255; j++)
-               {
-                       if (servers[j] != NULL)
-                       {
-                               if (strcmp(servers[j]->name,ServerName))
-                               {
-                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       log(DEBUG,"Sent Q token");
-                               }
-                       }
-               }
+               NetSendToAll(buffer);
        }
 
        /* push the socket on a stack of sockets due to be closed at the next opportunity
@@ -3972,18 +1956,9 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
                        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);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (strcmp(servers[j]->name,ServerName))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                               log(DEBUG,"Sent K token");
-                                       }
-                               }
-                       }
+                       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())
                        {
@@ -4110,17 +2085,7 @@ void handle_invite(char **parameters, int pcnt, userrec *user)
        // i token must go to ALL servers!!!
        char buffer[MAXBUF];
        snprintf(buffer,MAXBUF,"i %s %s %s",u->nick,user->nick,c->name);
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-               {
-                       if (strcmp(servers[j]->name,ServerName))
-                       {
-                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                               log(DEBUG,"Sent i token");
-                       }
-               }
-       }
+       NetSendToAll(buffer);
 }
 
 void handle_topic(char **parameters, int pcnt, userrec *user)
@@ -4179,17 +2144,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
                                // t token must go to ALL servers!!!
                                char buffer[MAXBUF];
                                snprintf(buffer,MAXBUF,"t %s %s :%s",user->nick,Ptr->name,topic);
-                               for (int j = 0; j < 255; j++)
-                               {
-                                       if (servers[j] != NULL)
-                                       {
-                                               if (strcmp(servers[j]->name,ServerName))
-                                               {
-                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                                       log(DEBUG,"Sent t token");
-                                               }
-                                       }
-                               }
+                               NetSendToAll(buffer);
                        }
                        else
                        {
@@ -4234,9 +2189,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))
        {
@@ -4486,16 +2442,7 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
                        // if any users of this channel are on remote servers, broadcast the packet
                        char buffer[MAXBUF];
                        snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,chan->name,parameters[1]);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       }
-                               }
-                       }
+                       NetSendToCommon(user,buffer);
                }
                else
                {
@@ -4530,19 +2477,9 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
                }
                else
                {
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (!strcasecmp(servers[j]->name,dest->server))
-                                       {
-                                               // direct write, same server
-                                               char buffer[MAXBUF];
-                                               snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       }
-                               }
-                       }
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"P %s %s :%s",user->nick,dest->nick,parameters[1]);
+                       NetSendToOne(dest->server,buffer);
                }
        }
        else
@@ -4589,16 +2526,7 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
                        // if any users of this channel are on remote servers, broadcast the packet
                        char buffer[MAXBUF];
                        snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,chan->name,parameters[1]);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                       {
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       }
-                               }
-                       }
+                       NetSendToCommon(user,buffer);
                }
                else
                {
@@ -4625,19 +2553,9 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
                }
                else
                {
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       if (!strcasecmp(servers[j]->name,dest->server))
-                                       {
-                                               // direct write, same server
-                                               char buffer[MAXBUF];
-                                               snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
-                                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       }
-                               }
-                       }
+                       char buffer[MAXBUF];
+                       snprintf(buffer,MAXBUF,"V %s %s :%s",user->nick,dest->nick,parameters[1]);
+                       NetSendToOne(dest->server,buffer);
                }
        }
        else
@@ -4647,45 +2565,6 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
        }
 }
 
-char lst[MAXBUF];
-
-char* chlist(userrec *user)
-{
-       int i = 0;
-       char cmp[MAXBUF];
-
-        log(DEBUG,"chlist: %s",user->nick);
-       strcpy(lst,"");
-       if (!user)
-       {
-               return lst;
-       }
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if (user->chans[i].channel != NULL)
-               {
-                       if (user->chans[i].channel->name)
-                       {
-                               strcpy(cmp,user->chans[i].channel->name);
-                               strcat(cmp," ");
-                               if (!strstr(lst,cmp))
-                               {
-                                       if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret))
-                                       {
-                                               strcat(lst,cmode(user,user->chans[i].channel));
-                                               strcat(lst,user->chans[i].channel->name);
-                                               strcat(lst," ");
-                                       }
-                               }
-                       }
-               }
-       }
-       if (strlen(lst))
-       {
-               lst[strlen(lst)-1] = '\0'; // chop trailing space
-       }
-       return lst;
-}
 
 void handle_info(char **parameters, int pcnt, userrec *user)
 {
@@ -4729,7 +2608,7 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
                        {
                                WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, chlist(dest));
                        }
-                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerDesc);
+                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
                        if (strcmp(dest->awaymsg,""))
                        {
                                WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
@@ -4739,8 +2618,11 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
                                WriteServ(user->fd,"313 %s %s :is an IRC operator",user->nick, dest->nick);
                        }
                        FOREACH_MOD OnWhois(user,dest);
-                       //WriteServ(user->fd,"310 %s %s :is available for help.",user->nick, dest->nick);
-                       WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
+                       if (!strcasecmp(user->server,dest->server))
+                       {
+                               // idle time and signon line can only be sent if youre on the same server (according to RFC)
+                               WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
+                       }
                        
                        WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
                }
@@ -4756,20 +2638,6 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
        }
 }
 
-void send_network_quit(const char* nick, const char* reason)
-{
-               char buffer[MAXBUF];
-               snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
-               for (int j = 0; j < 255; j++)
-               {
-                       if (servers[j] != NULL)
-                       {
-                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                               log(DEBUG,"Sent Q token");
-                       }
-               }
-}
-
 void handle_quit(char **parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = clientlist.find(user->nick);
@@ -4797,14 +2665,7 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
 
                        char buffer[MAXBUF];
                        snprintf(buffer,MAXBUF,"Q %s :%s%s",user->nick,PrefixQuit,parameters[0]);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       log(DEBUG,"Sent Q token");
-                               }
-                       }
+                       NetSendToAll(buffer);
                }
                else
                {
@@ -4814,14 +2675,7 @@ void handle_quit(char **parameters, int pcnt, userrec *user)
 
                        char buffer[MAXBUF];
                        snprintf(buffer,MAXBUF,"Q %s :Client exited",user->nick);
-                       for (int j = 0; j < 255; j++)
-                       {
-                               if (servers[j] != NULL)
-                               {
-                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       log(DEBUG,"Sent Q token");
-                               }
-                       }
+                       NetSendToAll(buffer);
                }
                FOREACH_MOD OnUserQuit(user);
                AddWhoWas(user);
@@ -4896,25 +2750,28 @@ void handle_who(char **parameters, int pcnt, userrec *user)
                else
                {
                        userrec* u = Find(parameters[0]);
-                       WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
+                       if (u)
+                       {
+                               WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
+                       }
+                       WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
                }
        }
        if (pcnt == 2)
        {
                 if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")) && (!strcmp(parameters[1],"o")))
                 {
-                        Ptr = user->chans[0].channel;
                        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
                         {
                                 if ((common_channels(user,i->second)) && (isnick(i->second->nick)))
                                 {
                                         if (strchr(i->second->modes,'o'))
                                         {
-                                                WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
+                                                WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, user->nick, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
                                         }
                                 }
                         }
-                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, Ptr->name);
+                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, user->nick);
                         return;
                 }
        }
@@ -4998,11 +2855,11 @@ long chancount(void)
 long count_servs(void)
 {
        int c = 0;
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-                       c++;
-       }
+       //for (int j = 0; j < 255; j++)
+       //{
+       //      if (servers[j] != NULL)
+       //              c++;
+       //}
        return c;
 }
 
@@ -5097,26 +2954,24 @@ void ConnectUser(userrec *user)
        ShowMOTD(user);
        FOREACH_MOD OnUserConnect(user);
        WriteOpers("*** Client connecting on port %d: %s!%s@%s",user->port,user->nick,user->ident,user->host);
-       
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,ServerName,user->fullname);
-       for (int j = 0; j < 255; j++)
-       {
-               if (servers[j] != NULL)
-               {
-                       if (strcmp(servers[j]->name,ServerName))
-                       {
-                               me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                               log(DEBUG,"Sent N token");
-                       }
-               }
-       }
-
+       
+       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)
 {
-       WriteServ(user->fd,"351 %s :%s %s %s :%s",user->nick,VERSION,"$Revision$ $Date$",ServerName,SYSTEM);
+       char Revision[] = "$Revision$";
+
+       char *s1 = Revision;
+       char *savept;
+       char *v1 = strtok_r(s1," ",&savept);
+       s1 = savept;
+       char *v2 = strtok_r(s1," ",&savept);
+       s1 = savept;
+       
+       WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%d)",user->nick,VERSION,v2,ServerName,SYSTEM,OPTIMISATION);
 }
 
 void handle_ping(char **parameters, int pcnt, userrec *user)
@@ -5447,56 +3302,109 @@ void handle_connect(char **parameters, int pcnt, userrec *user)
 
        if (me[defaultRoute])
        {
+               me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass,Link_ServerName,me[defaultRoute]->port);
+               return;
+       }
+       else
+       {
+               WriteServ(user->fd,"NOTICE %s :No default route is defined for server connections on this server. You must define a server connection to be default route so that sockets can be bound to it.",user->nick);
+       }
+}
 
-               // 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;
-                               //servers[j]->initiator = true;
-                               strcpy(servers[j]->internal_addr,Link_IPAddr);
-                               strcpy(servers[j]->name,Link_ServerName);
-                               log(DEBUG,"Allocated new serverrec");
-                               me[defaultRoute]->BeginLink(Link_IPAddr,LinkPort,Link_Pass,Link_ServerName);
-                               return;
+void DoSplitEveryone()
+{
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (strcasecmp(j->GetServerName().c_str(),ServerName))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
                        }
                }
-               WriteServ(user->fd,"NOTICE %s :*** Failed to create server record for address %s!",user->nick,Link_IPAddr);
        }
-       else
+       log(DEBUG,"Removed server. Will remove clients...");
+       // iterate through the userlist and remove all users on this server.
+       // because we're dealing with a mesh, we dont have to deal with anything
+       // "down-route" from this server (nice huh)
+       go_again = true;
+       char reason[MAXBUF];
+       while (go_again)
        {
-               WriteServ(user->fd,"NOTICE %s :No default route is defined for server connections on this server. You must define a server connection to be default route so that sockets can be bound to it.",user->nick);
+               go_again = false;
+               for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+               {
+                       if (strcasecmp(u->second->server,ServerName))
+                       {
+                               snprintf(reason,MAXBUF,"%s %s",ServerName,u->second->server);
+                               kill_link(u->second,reason);
+                               go_again = true;
+                               break;
+                       }
+               }
        }
 }
 
+
+
 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)
+       if (!pcnt)
+       {
+               WriteOpers("SQUIT command issued by %s",user->nick);
+               char buffer[MAXBUF];
+               snprintf(buffer,MAXBUF,"& %s",ServerName);
+               NetSendToAll(buffer);
+               DoSplitEveryone();
+       }
+       else
+       {
+               WriteServ(user->fd,"NOTICE :*** Remote SQUIT not supported yet.");
+       }
 }
 
-char islast(serverrec* s)
+char islast(const char* s)
 {
        char c = '`';
-       for (int j = 0; j < 255; j++)
+       for (int j = 0; j < 32; j++)
        {
-               if (servers[j] != NULL)
-               {
-                       c = '|';
-               }
-               if (servers[j] == s)
-               {
-                       c = '`';
+               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(serverrec* s)
+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->name))) c++;
+               if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++;
        }
        return c;
 }
@@ -5504,11 +3412,14 @@ long map_count(serverrec* s)
 void handle_links(char **parameters, int pcnt, userrec *user)
 {
        WriteServ(user->fd,"364 %s %s %s :0 %s",user->nick,ServerName,ServerName,ServerDesc);
-       for (int j = 0; j < 255; j++)
+       for (int j = 0; j < 32; j++)
        {
-               if (servers[j] != NULL)
+               if (me[j] != NULL)
                {
-                       WriteServ(user->fd,"364 %s %s %s :1 %s",user->nick,servers[j]->name,ServerName,servers[j]->description);
+                       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);
@@ -5521,14 +3432,17 @@ void handle_map(char **parameters, int pcnt, userrec *user)
        while (strlen(line) < 50)
                strcat(line," ");
        WriteServ(user->fd,"%s%d (%.2f%%)",line,local_count(),(float)(((float)local_count()/(float)usercnt())*100));
-       for (int j = 0; j < 255; j++)
+       for (int j = 0; j < 32; j++)
        {
-               if (servers[j] != NULL)
+               if (me[j] != NULL)
                {
-                       snprintf(line,MAXBUF,"006 %s :%c-%s",user->nick,islast(servers[j]),servers[j]->name);
-                       while (strlen(line) < 50)
-                               strcat(line," ");
-                       WriteServ(user->fd,"%s%d (%.2f%%)",line,map_count(servers[j]),(float)(((float)map_count(servers[j])/(float)usercnt())*100));
+                       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);
@@ -5562,7 +3476,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'))
@@ -5638,17 +3552,7 @@ void handle_nick(char **parameters, int pcnt, userrec *user)
                // Q token must go to ALL servers!!!
                char buffer[MAXBUF];
                snprintf(buffer,MAXBUF,"n %s %s",user->nick,parameters[0]);
-               for (int j = 0; j < 255; j++)
-               {
-                       if (servers[j] != NULL)
-                       {
-                               if (strcmp(servers[j]->name,ServerName))
-                               {
-                                       me[defaultRoute]->SendPacket(buffer,servers[j]->name);
-                                       log(DEBUG,"Sent n token");
-                               }
-                       }
-               }
+               NetSendToAll(buffer);
                
        }
        
@@ -5879,7 +3783,7 @@ void process_command(userrec *user, char* cmd)
                {
                        if (((command[x] < '0') || (command[x]> '9')) && (command[x] != '-'))
                        {
-                               if (strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
+                               if (!strchr("@!\"$%^&*(){}[]_-=+;:'#~,.<>/?\\|`",command[x]))
                                {
                                        kill_link(user,"Protocol violation (3)");
                                        return;
@@ -6044,7 +3948,7 @@ void SetupCommandTable(void)
        createcommand("TRACE",handle_trace,'o',0);
        createcommand("WHOWAS",handle_whowas,0,1);
        createcommand("CONNECT",handle_connect,'o',1);
-       createcommand("SQUIT",handle_squit,'o',1);
+       createcommand("SQUIT",handle_squit,'o',0);
        createcommand("MODULES",handle_modules,'o',0);
        createcommand("LINKS",handle_links,0,0);
        createcommand("MAP",handle_map,0,0);
@@ -6446,14 +4350,10 @@ void handle_N(char token,char* params,serverrec* source,serverrec* reply, char*
        {
                // nick collision
                WriteOpers("Nickname collision: %s@%s != %s@%s",nick,server,iter->second->nick,iter->second->server);
-               if (TS >= iter->second->age)
-               {
-                       char str[MAXBUF];
-                       snprintf(str,MAXBUF,"Killed (Nick Collision (%s@%s < %s@%s))",nick,server,iter->second->nick,iter->second->server);
-                       WriteServ(iter->second->fd, "KILL %s :%s",iter->second->nick,str);
-                       // client on remote server is older than the local user, kill the local user
-                       kill_link(iter->second,str);
-               }
+               char str[MAXBUF];
+               snprintf(str,MAXBUF,"Killed (Nick Collision (%s@%s < %s@%s))",nick,server,iter->second->nick,iter->second->server);
+               WriteServ(iter->second->fd, "KILL %s :%s",iter->second->nick,str);
+               kill_link(iter->second,str);
        }
        clientlist[nick] = new userrec();
        // remote users have an fd of -1. This is so that our Write abstraction
@@ -6464,7 +4364,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.
@@ -6499,8 +4399,8 @@ void handle_a(char token,char* params,serverrec* source,serverrec* reply, char*
 
 void handle_b(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
 {
-       char* nick = strtok(params," :");
-       char* host = strtok(NULL,"\r\n");
+       char* nick = strtok(params," ");
+       char* host = strtok(NULL," ");
        
        userrec* user = Find(nick);
 
@@ -6508,6 +4408,46 @@ void handle_b(char token,char* params,serverrec* source,serverrec* reply, char*
                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,"*** Connecting back to %s:%d",ipaddr,atoi(ipport));
+
+
+       bool conn_already = false;
+       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(),servername))
+                               {
+                                       if (me[i]->connectors[j].GetServerPort() == atoi(ipport))
+                                       {
+                                               log(DEBUG,"Already got a connection to %s:%d, ignoring +",ipaddr,atoi(ipport));
+                                               conn_already = true;
+                                       }
+                               }
+                       }
+               }
+       }
+       if (!conn_already)
+               me[defaultRoute]->MeshCookie(ipaddr,atoi(ipport),atoi(cookie),servername);
+}
+
+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)
 {
@@ -6561,15 +4501,234 @@ 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)
+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 DoSplit(const char* params)
+{
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (!strcasecmp(j->GetServerName().c_str(),params))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+       log(DEBUG,"Removed server. Will remove clients...");
+       // iterate through the userlist and remove all users on this server.
+       // because we're dealing with a mesh, we dont have to deal with anything
+       // "down-route" from this server (nice huh)
+       go_again = true;
+       char reason[MAXBUF];
+       snprintf(reason,MAXBUF,"%s %s",ServerName,params);
+       while (go_again)
+       {
+               go_again = false;
+               for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+               {
+                       if (!strcasecmp(u->second->server,params))
+                       {
+                               kill_link(u->second,reason);
+                               go_again = true;
+                               break;
+                       }
+               }
+       }
+}
+
+// removes a server. Will NOT remove its users!
+
+void RemoveServer(const char* name)
+{
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (!strcasecmp(j->GetServerName().c_str(),name))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+}
+
+void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
+{
+       log(DEBUG,"Netsplit! %s split from mesh, removing!",params);
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (!strcasecmp(j->GetServerName().c_str(),params))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+       log(DEBUG,"Removed server. Will remove clients...");
+       // iterate through the userlist and remove all users on this server.
+       // because we're dealing with a mesh, we dont have to deal with anything
+       // "down-route" from this server (nice huh)
+       go_again = true;
+       char reason[MAXBUF];
+       snprintf(reason,MAXBUF,"%s %s",ServerName,params);
+       while (go_again)
+       {
+               go_again = false;
+               for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+               {
+                       if (!strcasecmp(u->second->server,params))
+                       {
+                               kill_link(u->second,reason);
+                               go_again = true;
+                               break;
+                       }
+               }
+       }
+}
+
+long authcookie;
+
+
+void process_restricted_commands(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,char* ipaddr,int port)
 {
+       char buffer[MAXBUF];
+
        switch(token)
        {
                // Y <TS>
                // start netburst
                case 'Y':
                        nb_start = time(NULL);
-                       WriteOpers("Server %s is starting netburst.",source->name);
+                       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.
+                       authcookie = rand()*rand();
+                       snprintf(buffer,MAXBUF,"~ %d",authcookie);
+                       NetSendToAll(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;
+               // node unreachable - we cant route to a server, sooooo we slit it off.
+               // servers can generate these for themselves for an squit.
+               case '&':
+                       handle_amp(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
@@ -6676,12 +4835,19 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
                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;
+                       // 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;
+               // 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:
@@ -6698,21 +4864,92 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
        char* params = udp_msg + 2;
        char finalparam[1024];
        strcpy(finalparam," :xxxx");
-       if (strstr(params," :")) {
-               strncpy(finalparam,strstr(params," :"),1024);
+       if (strstr(udp_msg," :")) {
+               strncpy(finalparam,strstr(udp_msg," :"),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);
+                                                               me[j]->connectors[k].SetDescription(serverdesc);
+                                                               me[j]->connectors[k].SetState(STATE_CONNECTED);
+                                                               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
+               // S test.chatspike.net password portn :ChatSpike InspIRCd test server
                char* servername = strtok(params," ");
                char* password = strtok(NULL," ");
+               char* myport = strtok(NULL," ");
+               char* revision = strtok(NULL," ");
                char* serverdesc = finalparam+2;
-               WriteOpers("CONNECT from %s (%s)",servername,udp_host);
+
+               WriteOpers("CONNECT from %s (%s) (their port: %d)",servername,udp_host,atoi(myport));
                
+               ircd_connector* cn = serv->FindHost(servername);
+               
+               if (cn)
+               {
+                       WriteOpers("CONNECT aborted: Server %s already exists from %s",servername,ServerName);
+                       char buffer[MAXBUF];
+                       sprintf(buffer,"E :Server %s already exists!",servername);
+                       serv->SendPacket(buffer,udp_host);
+                       RemoveServer(udp_host);
+                       return;
+               }
+
+               if (atoi(revision) != GetRevision())
+               {
+                       WriteOpers("CONNECT aborted: Could not link to %s, is an incompatible version %s, our version is %d",servername,revision,GetRevision());
+                       char buffer[MAXBUF];
+                       sprintf(buffer,"E :Version number mismatch");
+                       serv->SendPacket(buffer,udp_host);
+                       RemoveServer(udp_host);
+                       RemoveServer(servername);
+                       return;
+               }
+
                for (int j = 0; j < serv->connectors.size(); j++)
                {
                        if (!strcasecmp(serv->connectors[j].GetServerName().c_str(),udp_host))
                        {
                                serv->connectors[j].SetServerName(servername);
+                               serv->connectors[j].SetDescription(serverdesc);
+                               serv->connectors[j].SetServerPort(atoi(myport));
                        }
                }
                
@@ -6740,6 +4977,15 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                // send a 'diminutive' server message back...
                                snprintf(response,10240,"s %s %s :%s",ServerName,Link_SendPass,ServerDesc);
                                serv->SendPacket(response,servername);
+
+                               for (int t = 0; t < serv->connectors.size(); t++)
+                               {
+                                       if (!strcasecmp(serv->connectors[t].GetServerName().c_str(),servername))
+                                       {
+                                               serv->connectors[t].SetState(STATE_CONNECTED);
+                                       }
+                               }
+               
                                return;
                        }
                }
@@ -6747,6 +4993,8 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                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);
+               RemoveServer(udp_host);
+               RemoveServer(servername);
                return;
        }
        else
@@ -6761,9 +5009,6 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                // to an 'S' command. If we didn't recently send an 'S' to this server, theyre trying to spoof
                // a connect, so put out an oper alert!
                
-               
-               
-               
                // for now, just accept all, we'll fix that later.
                WriteOpers("%s accepted our link credentials ",servername);
                
@@ -6789,18 +5034,23 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                                // 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)
+                               for (int j = 0; j < 32; j++)
+                               {
+                                       if (me[j] != NULL)
                                        {
-                                               if (!strcasecmp(servers[j]->name,udp_host))
-                                               {
-                                                       strcpy(servers[j]->description,serverdesc);
-                                                       DoSync(serv,udp_host);
-                                                       char buffer[MAXBUF];
-                                                       sprintf(buffer,"X 0");
-                                                       serv->SendPacket(buffer,udp_host);
-                                                       return;
+                                               for (int k = 0; k < me[j]->connectors.size(); k++)
+                                               {
+                                                       if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),udp_host))
+                                                       {
+                                                               char buffer[MAXBUF];
+                                                               me[j]->connectors[k].SetDescription(serverdesc);
+                                                               me[j]->connectors[k].SetState(STATE_CONNECTED);
+                                                               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);
@@ -6815,40 +5065,35 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                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);
+               RemoveServer(udp_host);
+               RemoveServer(servername);
                return;
        }
        else
        if (token == 'E') {
                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]->name,udp_host)) {
-                                       delete servers[j];
-                                       return;
-                               }
-                       }
-               }
                return;
        }
        else {
 
                serverrec* source_server = NULL;
 
-               for (int j = 0; j < 255; j++)
+               for (int j = 0; j < 32; j++)
                {
-                       if (servers[j] != NULL)
+                       if (me[j] != NULL)
                        {
-                               for (int x = 0; x < servers[j]->connectors.size(); j++)
+                               for (int x = 0; x < me[j]->connectors.size(); x++)
                                {
-                                       if (servers[j]->connectors[x].GetServerName() == std::string(udp_host))
+                                       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))
                                        {
-                                               // 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,servers[j],serv,udp_host);
-                                               return;
+                                               if (me[j]->connectors[x].GetState() == STATE_CONNECTED)
+                                               {
+                                                       // found a valid ircd_connector.
+                                                       process_restricted_commands(token,params,me[j],serv,udp_host,me[j]->connectors[x].GetServerIP(),me[j]->connectors[x].GetServerPort());
+                                                       return;
+                                               }
                                        }
                                }
                        }
@@ -7040,6 +5285,9 @@ int InspIRCd(void)
        /* main loop, this never returns */
        for (;;)
        {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+               sched_yield();
+#endif
 
                fd_set sfd;
                timeval tval;
@@ -7049,7 +5297,7 @@ int InspIRCd(void)
 
                // *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>300)
                {
                        if (fd_reap.size() > 0)
                        {
@@ -7063,6 +5311,7 @@ int InspIRCd(void)
                        fd_reap.clear();
                        reap_counter=0;
                }
+               reap_counter++;
 
                fd_set serverfds;
                FD_ZERO(&serverfds);
@@ -7083,16 +5332,22 @@ int InspIRCd(void)
                        {
                                if (FD_ISSET (me[x]->fd, &serverfds))
                                {
-                                       char remotehost[MAXBUF];
+                                       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);
+                                       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,remotehost);
+                                       // *FIX* - we need the LOCAL port not the remote port in &client!
+                                       me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port);
                                }
                        }
                }
      
-               for (int x = 0; x != UDPportCount; x++)
+               for (int x = 0; x < UDPportCount; x++)
                {
                        std::deque<std::string> msgs;
                        msgs.clear();
@@ -7103,10 +5358,15 @@ int InspIRCd(void)
                                        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]);
                                }
@@ -7185,6 +5445,11 @@ int InspIRCd(void)
                        //if (selectResult2 > 0)
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
                        {
+
+#ifdef _POSIX_PRIORITY_SCHEDULING
+                               sched_yield();
+#endif
+
                                result = EAGAIN;
                                if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
                                {
@@ -7194,7 +5459,8 @@ int InspIRCd(void)
                                        
                                        if (result)
                                        {
-                                               log(DEBUG,"Read %d characters from socket",result);
+                                               if (result > 0)
+                                                       log(DEBUG,"Read %d characters from socket",result);
                                                userrec* current = count2a->second;
                                                int currfd = current->fd;
                                                char* l = strtok(data,"\n");
@@ -7293,7 +5559,6 @@ int InspIRCd(void)
                FD_SET (openSockfd[count], &selectFds);
        }
 
-       reap_counter++;
        tv.tv_usec = 1;
        selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
 
@@ -7305,6 +5570,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);