]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Fixed server descriptions in /whois and /links (untested)
[user/henk/code/inspircd.git] / src / inspircd.cpp
index ab24d5ed8557c68ea6b5eca30f651431660d11df..851473bf9929a9e0fadd738e010ca641a886a1e3 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"
@@ -76,7 +78,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 +151,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,6 +184,7 @@ char* Passwd(userrec *user);
 bool IsDenied(userrec *user);
 void AddWhoWas(userrec* u);
 
+std::vector<long> auth_cookies;
 std::stringstream config_f(stringstream::in | stringstream::out);
 
 void safedelete(userrec *p)
@@ -716,6 +718,26 @@ int c_count(userrec* u)
 
 }
 
+
+std::string GetServerDescription(char* 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(),servername))
+                               {
+                                       return me[j]->connectors[k].GetDescription();
+                               }
+                       }
+               }
+               return "";
+       }
+}
+
+
 /* 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) */
 
@@ -869,7 +891,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 +900,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,6 +909,119 @@ 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());
+                               }
+                       }
+               }
+       }
+}
+
+
+void NetSendToAll(char* s)
+{
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"%s",s);
+       
+       log(DEBUG,"NetSendToAll: '%s'",s);
+
+       for (int j = 0; j < 32; j++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                       }
+               }
+       }
+}
+
+void 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++)
+       {
+               if (me[j] != NULL)
+               {
+                       for (int k = 0; k < me[j]->connectors.size(); k++)
+                       {
+                               if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+                               {
+                                       me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+                               }
+                       }
+               }
+       }
+}
+
 
 bool hasumode(userrec* user, char mode)
 {
@@ -952,19 +1088,17 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 void ChangeName(userrec* user, const char* gecos)
 {
        strncpy(user->fullname,gecos,MAXBUF);
+
+       // TODO: replace these with functions:
+       // NetSendToAll - to all
+       // NetSendToCommon - to all that hold users sharing a common channel with another user
+       // NetSendToOne - to one server
+       // NetSendToAllExcept - send to all but one
+       // all by servername
+
        char buffer[MAXBUF];
        snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
-       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");
-                       }
-               }
-       }
+       NetSendToAll(buffer);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
@@ -972,17 +1106,7 @@ 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");
-                       }
-               }
-       }
+       NetSendToAll(buffer);
 }
 
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)  
@@ -1015,17 +1139,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);
        }
 }  
 
@@ -1650,14 +1764,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 +1829,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 +1840,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);
@@ -2672,17 +2765,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                        // 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");
-                                                       }
-                                               }
-                                       }
+                                       NetSendToAll(buffer);
                                }
                                        
                        }
@@ -2694,17 +2777,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                        // 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");
-                                                       }
-                                               }
-                                       }
+                                       NetSendToAll(buffer);
                                }
                        }
                }
@@ -2794,7 +2867,6 @@ bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
        }
        else
        {
-               log(DEBUG,"*** BUG *** Non-module umode passed to process_module_umode!");
                if (faked)
                {
                        delete s2;
@@ -2989,17 +3061,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        // 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");
-                                       }
-                               }
-                       }
+                       NetSendToAll(buffer);
 
                        if (strlen(dmodes)>MAXMODES)
                        {
@@ -3214,17 +3276,7 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                        // 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");
-                                       }
-                               }
-                       }
+                       NetSendToAll(buffer);
                        
                        if (strlen(dmodes)>MAXMODES)
                        {
@@ -3846,15 +3898,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 +3959,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 +4006,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 +4135,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 +4194,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 +4239,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 +4492,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 +4527,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 +4576,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 +4603,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
@@ -4729,7 +4697,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));
                        if (strcmp(dest->awaymsg,""))
                        {
                                WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
@@ -4758,16 +4726,9 @@ 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");
-                       }
-               }
+       char buffer[MAXBUF];
+       snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
+       NetSendToAll(buffer);
 }
 
 void handle_quit(char **parameters, int pcnt, userrec *user)
@@ -4797,14 +4758,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 +4768,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);
@@ -4998,11 +4945,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;
 }
 
@@ -5100,18 +5047,7 @@ void ConnectUser(userrec *user)
        
        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");
-                       }
-               }
-       }
-
+       NetSendToAll(buffer);
 }
 
 void handle_version(char **parameters, int pcnt, userrec *user)
@@ -5447,56 +5383,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 +5493,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 +5513,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 +5557,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 +5633,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 +5864,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 +6029,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 +6431,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 +6445,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.
@@ -6508,6 +6489,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 +6582,206 @@ 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;
+                       }
+               }
+       }
+}
+
+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 +6888,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 +6917,67 @@ 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* serverdesc = finalparam+2;
-               WriteOpers("CONNECT from %s (%s)",servername,udp_host);
+               WriteOpers("CONNECT from %s (%s) (their port: %d)",servername,udp_host,atoi(myport));
                
                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 +7005,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;
                        }
                }
@@ -6761,9 +7035,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 +7060,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);
@@ -6822,33 +7098,27 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                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(); x++)
+                               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 +7310,9 @@ int InspIRCd(void)
        /* main loop, this never returns */
        for (;;)
        {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+               sched_yield();
+#endif
 
                fd_set sfd;
                timeval tval;
@@ -7049,7 +7322,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 +7336,7 @@ int InspIRCd(void)
                        fd_reap.clear();
                        reap_counter=0;
                }
+               reap_counter++;
 
                fd_set serverfds;
                FD_ZERO(&serverfds);
@@ -7083,16 +7357,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 +7383,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 +7470,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 +7484,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 +7584,6 @@ int InspIRCd(void)
                FD_SET (openSockfd[count], &selectFds);
        }
 
-       reap_counter++;
        tv.tv_usec = 1;
        selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
 
@@ -7305,6 +7595,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);