]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/users.cpp
Remove unused debug
[user/henk/code/inspircd.git] / src / users.cpp
index 5654133ecf530f0ddb165389674b0ee3427fffb2..ed979e337a29db2f5fa2183f6c26572604451b5d 100644 (file)
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h" 
+#include "configreader.h"
 #include "channels.h"
-#include "connection.h"
 #include "users.h"
 #include "inspircd.h"
-#include <stdio.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#include <signal.h>
-#endif
-#include "inspstring.h"
-#include "commands.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
+#include <stdarg.h>
 #include "socketengine.h"
-#include "hashcomp.h"
-#include "message.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "cull_list.h"
 
-extern InspIRCd* ServerInstance;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-extern ServerConfig *Config;
-extern user_hash clientlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> local_users;
+static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
+
+/* XXX: Used for speeding up WriteCommon operations */
+unsigned long uniq_id = 0;
+
+bool InitTypes(ServerConfig* conf, const char* tag)
+{
+       if (conf->opertypes.size())
+       {
+               conf->GetInstance()->Log(DEBUG,"Currently %d items to clear",conf->opertypes.size());
+               for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++)
+               {
+                       conf->GetInstance()->Log(DEBUG,"Clear item");
+                       if (n->second)
+                               delete[] n->second;
+               }
+       }
+       
+       conf->opertypes.clear();
+       return true;
+}
+
+bool InitClasses(ServerConfig* conf, const char* tag)
+{
+       if (conf->operclass.size())
+       {
+               for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++)
+               {
+                       if (n->second)
+                               delete[] n->second;
+               }
+       }
+       
+       conf->operclass.clear();
+       return true;
+}
+
+bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* TypeName = values[0].GetString();
+       const char* Classes = values[1].GetString();
+       
+       conf->opertypes[TypeName] = strdup(Classes);
+       conf->GetInstance()->Log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
+       return true;
+}
+
+bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* ClassName = values[0].GetString();
+       const char* CommandList = values[1].GetString();
+       
+       conf->operclass[ClassName] = strdup(CommandList);
+       conf->GetInstance()->Log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
+       return true;
+}
+
+bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
+{
+       return true;
+}
+
+std::string userrec::ProcessNoticeMasks(const char *sm)
+{
+       bool adding = true, oldadding = false;
+       const char *c = sm;
+       std::string output;
+
+       ServerInstance->Log(DEBUG,"Process notice masks");
+
+       while (c && *c)
+       {
+               ServerInstance->Log(DEBUG,"Process notice mask %c",*c);
+               
+               switch (*c)
+               {
+                       case '+':
+                               adding = true;
+                       break;
+                       case '-':
+                               adding = false;
+                       break;
+                       case '*':
+                               for (unsigned char d = 'A'; d <= 'z'; d++)
+                               {
+                                       if (ServerInstance->SNO->IsEnabled(d))
+                                       {
+                                               if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
+                                               {
+                                                       if ((oldadding != adding) || (!output.length()))
+                                                               output += (adding ? '+' : '-');
+
+                                                       this->SetNoticeMask(d, adding);
+
+                                                       output += d;
+                                               }
+                                       }
+                                       oldadding = adding;
+                               }
+                       break;
+                       default:
+                               if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+                               {
+                                       if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
+                                       {
+                                               if ((oldadding != adding) || (!output.length()))
+                                                       output += (adding ? '+' : '-');
+
+                                               this->SetNoticeMask(*c, adding);
+
+                                               output += *c;
+                                       }
+                               }
+                               oldadding = adding;
+                       break;
+               }
+
+               *c++;
+       }
 
-std::vector<userrec*> all_opers;
+       return output;
+}
 
-typedef std::map<irc::string,char*> opertype_t;
-typedef opertype_t operclass_t;
+void userrec::StartDNSLookup()
+{
+       ServerInstance->Log(DEBUG,"Commencing reverse lookup");
+       try
+       {
+               ServerInstance->Log(DEBUG,"Passing instance: %08x",this->ServerInstance);
+               res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), DNS_QUERY_REVERSE);
+               this->ServerInstance->AddResolver(res_reverse);
+       }
+       catch (ModuleException& e)
+       {
+               ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+       }
+}
 
-opertype_t opertypes;
-operclass_t operclass;
+UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt) :
+       Resolver(Instance, to_resolve, qt), bound_user(user)
+{
+       this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
+       this->bound_fd = user->GetFd();
+}
 
-void ReadClassesAndTypes()
+void UserResolver::OnLookupComplete(const std::string &result)
 {
-       char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
-       for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
+       if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
-               if (n->second)
-                       delete[] n->second;
+               ServerInstance->Log(DEBUG,"Commencing forward lookup");
+               this->bound_user->stored_host = result;
+               try
+               {
+                       /* Check we didnt time out */
+                       if (this->bound_user->registered != REG_ALL)
+                       {
+#ifdef IPV6
+                               const char *ip = this->bound_user->GetIPString();
+                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (strstr(ip,"0::ffff:") == ip ? DNS_QUERY_A : DNS_QUERY_AAAA));
+#else
+                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A);
+#endif
+                               this->ServerInstance->AddResolver(bound_user->res_forward);
+                       }
+               }
+               catch (ModuleException& e)
+               {
+                       ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+               }
        }
-       for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
+       else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
-               if (n->second)
-                       delete[] n->second;
+               /* Both lookups completed */
+               std::string result2 = "0::ffff:";
+               result2.append(result);
+               if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2)
+               {
+                       std::string hostname = this->bound_user->stored_host;
+                       if (hostname.length() < 65)
+                       {
+                               /* Check we didnt time out */
+                               if (this->bound_user->registered != REG_ALL)
+                               {
+                                       /* Hostnames starting with : are not a good thing (tm) */
+                                       if (*(hostname.c_str()) == ':')
+                                               hostname = "0" + hostname;
+
+                                       this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
+                                       this->bound_user->dns_done = true;
+                                       strlcpy(this->bound_user->dhost, hostname.c_str(),64);
+                                       strlcpy(this->bound_user->host, hostname.c_str(),64);
+                               }
+                       }
+                       else
+                       {
+                               this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString());
+                       }
+               }
+               else
+               {
+                       this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString());
+               }
        }
-       opertypes.clear();
-       operclass.clear();
-       for (int j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
+}
+
+void UserResolver::OnError(ResolverError e, const std::string &errormessage)
+{
+       if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
        {
-               Config->ConfValue("type","name",j,TypeName,&Config->config_f);
-               Config->ConfValue("type","classes",j,Classes,&Config->config_f);
-               opertypes[TypeName] = strdup(Classes);
-               log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
+               /* Error message here */
+               this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
+               this->bound_user->dns_done = true;
        }
-       for (int k =0; k < Config->ConfValueEnum("class",&Config->config_f); k++)
+}
+
+
+bool userrec::IsNoticeMaskSet(unsigned char sm)
+{
+       return (snomasks[sm-65]);
+}
+
+void userrec::SetNoticeMask(unsigned char sm, bool value)
+{
+       snomasks[sm-65] = value;
+}
+
+const char* userrec::FormatNoticeMasks()
+{
+       static char data[MAXBUF];
+       int offset = 0;
+
+       for (int n = 0; n < 64; n++)
        {
-               Config->ConfValue("class","name",k,ClassName,&Config->config_f);
-               Config->ConfValue("class","commands",k,CommandList,&Config->config_f);
-               operclass[ClassName] = strdup(CommandList);
-               log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
+               if (snomasks[n])
+                       data[offset++] = n+65;
        }
+
+       data[offset] = 0;
+       return data;
+}
+
+
+
+bool userrec::IsModeSet(unsigned char m)
+{
+       return (modes[m-65]);
 }
 
-template<typename T> inline string ConvToStr(const T &in)
+void userrec::SetMode(unsigned char m, bool value)
 {
-        stringstream tmp;
-        if (!(tmp << in)) return string();
-        return tmp.str();
+       modes[m-65] = value;
 }
 
-userrec::userrec()
+const char* userrec::FormatModes()
 {
+       static char data[MAXBUF];
+       int offset = 0;
+       for (int n = 0; n < 64; n++)
+       {
+               if (modes[n])
+                       data[offset++] = n+65;
+       }
+       data[offset] = 0;
+       return data;
+}
+
+userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
+{
+       ServerInstance->Log(DEBUG,"userrec::userrec(): Instance: %08x",ServerInstance);
        // the PROPER way to do it, AVOID bzero at *ALL* costs
-       *password = *nick = *ident = *host = *dhost = *fullname = *modes = *awaymsg = *oper = 0;
-       server = (char*)FindServerNamePtr(Config->ServerName);
-       reset_due = TIME;
-       lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
-       timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       haspassed = dns_done = false;
+       *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
+       server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
+       reset_due = ServerInstance->Time();
+       age = ServerInstance->Time(true);
+       lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
+       ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+       exempt = haspassed = dns_done = false;
+       fd = -1;
        recvq = "";
        sendq = "";
+       WriteError = "";
+       res_forward = res_reverse = NULL;
+       ip = NULL;
        chans.clear();
        invites.clear();
+       chans.resize(MAXCHANS);
+       memset(modes,0,sizeof(modes));
+       memset(snomasks,0,sizeof(snomasks));
+       
+       for (unsigned int n = 0; n < MAXCHANS; n++)
+       {
+               chans[n] = new ucrec();
+               chans[n]->channel = NULL;
+               chans[n]->uc_modes = 0;
+       }
 }
 
 userrec::~userrec()
 {
+       for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+       {
+               ucrec* x = (ucrec*)*n;
+               delete x;
+       }
+
+       if (ip)
+       {
+               clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
+               if (x != ServerInstance->local_clones.end())
+               {
+                       x->second--;
+                       if (!x->second)
+                       {
+                               ServerInstance->local_clones.erase(x);
+                       }
+               }
+       
+               clonemap::iterator y = ServerInstance->global_clones.find(this->GetIPString());
+               if (y != ServerInstance->global_clones.end())
+               {
+                       y->second--;
+                       if (!y->second)
+                       {
+                               ServerInstance->global_clones.erase(y);
+                       }
+               }
+
+               if (this->GetProtocolFamily() == AF_INET)
+               {
+                       delete (sockaddr_in*)ip;
+               }
+#ifdef SUPPORT_IP6LINKS
+               else
+               {
+                       delete (sockaddr_in6*)ip;
+               }
+#endif
+       }
 }
 
-void userrec::MakeHost(char* nhost)
+char* userrec::MakeHost()
 {
+       static char nhost[MAXBUF];
        /* This is much faster than snprintf */
        char* t = nhost;
        for(char* n = ident; *n; n++)
@@ -127,6 +375,21 @@ void userrec::MakeHost(char* nhost)
        for(char* n = host; *n; n++)
                *t++ = *n;
        *t = 0;
+       return nhost;
+}
+
+char* userrec::MakeHostIP()
+{
+       static char ihost[MAXBUF];
+       /* This is much faster than snprintf */
+       char* t = ihost;
+       for(char* n = ident; *n; n++)
+               *t++ = *n;
+       *t++ = '@';
+       for(const char* n = this->GetIPString(); *n; n++)
+               *t++ = *n;
+       *t = 0;
+       return ihost;
 }
 
 void userrec::CloseSocket()
@@ -165,11 +428,12 @@ char* userrec::MakeWildHost()
 
 int userrec::ReadData(void* buffer, size_t size)
 {
-       if (this->fd > -1)
+       if (IS_LOCAL(this))
        {
                return read(this->fd, buffer, size);
        }
-       else return 0;
+       else
+               return 0;
 }
 
 
@@ -194,6 +458,7 @@ bool userrec::IsInvited(irc::string &channel)
        for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
        {
                irc::string compare = i->channel;
+               
                if (compare == channel)
                {
                        return true;
@@ -216,616 +481,1642 @@ void userrec::InviteTo(irc::string &channel)
 
 void userrec::RemoveInvite(irc::string &channel)
 {
-       log(DEBUG,"Removing invites");
+       ServerInstance->Log(DEBUG,"Removing invites");
+       
        if (invites.size())
        {
                for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
                {
                        irc::string compare = i->channel;
+                       
                        if (compare == channel)
                        {
                                invites.erase(i);
                                return;
-                               }
+                               }
                        }
                }
 }
 
-bool userrec::HasPermission(std::string &command)
+bool userrec::HasPermission(const std::string &command)
 {
        char* mycmd;
        char* savept;
        char* savept2;
        
-       // users on remote servers can completely bypass
-       // all permissions based checks.
-       // This prevents desyncs when one server has different
-       // type/class tags to another.
+       /*
+        * users on remote servers can completely bypass all permissions based checks.
+        * This prevents desyncs when one server has different type/class tags to another.
+        * That having been said, this does open things up to the possibility of source changes
+        * allowing remote kills, etc - but if they have access to the src, they most likely have
+        * access to the conf - so it's an end to a means either way.
+        */
        if (!IS_LOCAL(this))
                return true;
        
        // are they even an oper at all?
        if (*this->oper)
        {
-               opertype_t::iterator iter_opertype = opertypes.find(this->oper);
-               if (iter_opertype != opertypes.end())
+               opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
+               if (iter_opertype != ServerInstance->Config->opertypes.end())
                {
-                       char* Classes = iter_opertype->second;
+                       char* Classes = strdup(iter_opertype->second);
                        char* myclass = strtok_r(Classes," ",&savept);
                        while (myclass)
                        {
-                               operclass_t::iterator iter_operclass = operclass.find(myclass);
-                               if (iter_operclass != operclass.end())
+                               operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
+                               if (iter_operclass != ServerInstance->Config->operclass.end())
                                {
-                                       char* CommandList = iter_operclass->second;
+                                       char* CommandList = strdup(iter_operclass->second);
                                        mycmd = strtok_r(CommandList," ",&savept2);
                                        while (mycmd)
                                        {
                                                if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
                                                {
+                                                       free(Classes);
+                                                       free(CommandList);
                                                        return true;
                                                }
                                                mycmd = strtok_r(NULL," ",&savept2);
                                        }
+                                       free(CommandList);
                                }
                                myclass = strtok_r(NULL," ",&savept);
                        }
+                       free(Classes);
                }
        }
        return false;
 }
 
-
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
 bool userrec::AddBuffer(std::string a)
 {
-        std::string b = "";
-        for (unsigned int i = 0; i < a.length(); i++)
-                if ((a[i] != '\r') && (a[i] != '\0') && (a[i] != 7))
-                        b = b + a[i];
-        std::stringstream stream(recvq);
-        stream << b;
-        recvq = stream.str();
-       unsigned int i = 0;
-       // count the size of the first line in the buffer.
-       while (i < recvq.length())
-       {
-               if (recvq[i++] == '\n')
-                       break;
+       try
+       {
+               std::string::size_type i = a.rfind('\r');
+       
+               while (i != std::string::npos)
+               {
+                       a.erase(i, 1);
+                       i = a.rfind('\r');
+               }
+
+               if (a.length())
+                       recvq.append(a);
+               
+               if (recvq.length() > (unsigned)this->recvqmax)
+               {
+                       this->SetWriteError("RecvQ exceeded");
+                       ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+                       return false;
+               }
+       
+               return true;
        }
-       if (recvq.length() > (unsigned)this->recvqmax)
+
+       catch (...)
        {
-               this->SetWriteError("RecvQ exceeded");
-               WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+               ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()");
+               return false;
        }
-       // return false if we've had more than 600 characters WITHOUT
-       // a carriage return (this is BAD, drop the socket)
-       return (i < 600);
 }
 
 bool userrec::BufferIsReady()
 {
-       unsigned int t = recvq.length();
-        for (unsigned int i = 0; i < t; i++)
-               if (recvq[i] == '\n')
-                       return true;
-        return false;
+       return (recvq.find('\n') != std::string::npos);
 }
 
 void userrec::ClearBuffer()
 {
-        recvq = "";
+       recvq = "";
 }
 
 std::string userrec::GetBuffer()
 {
-       if (recvq == "")
+       try
+       {
+               if (!recvq.length())
+                       return "";
+       
+               /* Strip any leading \r or \n off the string.
+                * Usually there are only one or two of these,
+                * so its is computationally cheap to do.
+                */
+               while ((*recvq.begin() == '\r') || (*recvq.begin() == '\n'))
+                       recvq.erase(recvq.begin());
+       
+               for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+               {
+                       /* Find the first complete line, return it as the
+                        * result, and leave the recvq as whats left
+                        */
+                       if (*x == '\n')
+                       {
+                               std::string ret = std::string(recvq.begin(), x);
+                               recvq.erase(recvq.begin(), x + 1);
+                               return ret;
+                       }
+               }
+               return "";
+       }
+
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()");
                return "";
-        char* line = (char*)recvq.c_str();
-        std::string ret = "";
-        while ((*line != '\n') && (*line))
-        {
-                ret = ret + *line;
-                line++;
-        }
-        if ((*line == '\n') || (*line == '\r'))
-                line++;
-        recvq = line;
-        return ret;
-}
-
-void userrec::AddWriteBuf(std::string data)
-{
-       if (this->GetWriteError() != "")
+       }
+}
+
+void userrec::AddWriteBuf(const std::string &data)
+{
+       if (*this->GetWriteError())
                return;
+       
        if (sendq.length() + data.length() > (unsigned)this->sendqmax)
        {
-               /* Fix by brain - Set the error text BEFORE calling writeopers, because
+               /*
+                * Fix by brain - Set the error text BEFORE calling writeopers, because
                 * if we dont it'll recursively  call here over and over again trying
                 * to repeatedly add the text to the sendq!
                 */
                this->SetWriteError("SendQ exceeded");
-               WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
+               ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
                return;
        }
-        std::stringstream stream;
-        stream << sendq << data;
-        sendq = stream.str();
+
+       try 
+       {
+               if (data.length() > 512)
+               {
+                       std::string newdata(data);
+                       newdata.resize(510);
+                       newdata.append("\r\n");
+                       sendq.append(newdata);
+               }
+               else
+               {
+                       sendq.append(data);
+               }
+       }
+       catch (...)
+       {
+               this->SetWriteError("SendQ exceeded");
+               ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick);
+       }
 }
 
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
 void userrec::FlushWriteBuf()
 {
-       if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+       try
        {
-               char* tb = (char*)this->sendq.c_str();
-               int n_sent = write(this->fd,tb,this->sendq.length());
-               if (n_sent == -1)
+               if ((this->fd == FD_MAGIC_NUMBER) || (*this->GetWriteError()))
                {
-                       this->SetWriteError(strerror(errno));
+                       sendq = "";
                }
-               else
+               if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
                {
-                       // advance the queue
-                       tb += n_sent;
-                       this->sendq = tb;
-                       // update the user's stats counters
-                       this->bytes_out += n_sent;
-                       this->cmds_out++;
+                       int old_sendq_length = sendq.length();
+                       const char* tb = this->sendq.c_str();
+                       int n_sent = write(this->fd,tb,this->sendq.length());
+                       if (n_sent == -1)
+                       {
+                               if (errno == EAGAIN)
+                               {
+                                       ServerInstance->Log(DEBUG,"EAGAIN, want write");
+                                       this->ServerInstance->SE->WantWrite(this);
+                               }
+                               else
+                               {
+                                       this->QuitUser(ServerInstance, this, strerror(errno));
+                                       return;
+                               }
+                       }
+                       else
+                       {
+                               /*ServerInstance->Log(DEBUG,"Wrote: %d of %d: %s", n_sent, old_sendq_length, sendq.substr(0, n_sent).c_str());*/
+                               // advance the queue
+                               tb += n_sent;
+                               this->sendq = tb;
+                               // update the user's stats counters
+                               this->bytes_out += n_sent;
+                               this->cmds_out++;
+                               if (n_sent != old_sendq_length)
+                               {
+                                       ServerInstance->Log(DEBUG,"Not all written, want write");
+                                       this->ServerInstance->SE->WantWrite(this);
+                               }
+                       }
                }
        }
-}
 
-void userrec::SetWriteError(std::string error)
-{
-       log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
-       // don't try to set the error twice, its already set take the first string.
-       if (this->WriteError == "")
-               this->WriteError = error;
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()");
+       }
 }
 
-std::string userrec::GetWriteError()
+void userrec::SetWriteError(const std::string &error)
 {
-       return this->WriteError;
-}
+       try
+       {
+               ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
+               // don't try to set the error twice, its already set take the first string.
+               if (!this->WriteError.length())
+               {
+                       ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
+                       this->WriteError = error;
+               }
+       }
 
-void AddOper(userrec* user)
-{
-        log(DEBUG,"Oper added to optimization list");
-        all_opers.push_back(user);
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()");
+       }
 }
 
-void DeleteOper(userrec* user)
+const char* userrec::GetWriteError()
 {
-        for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
-        {
-                if (*a == user)
-                {
-                        log(DEBUG,"Oper removed from optimization list");
-                        all_opers.erase(a);
-                        return;
-                }
-        }
+       return this->WriteError.c_str();
 }
 
-void kill_link(userrec *user,const char* r)
+void userrec::Oper(const std::string &opertype)
 {
-        user_hash::iterator iter = clientlist.find(user->nick);
+       try
+       {
+               this->modes[UM_OPERATOR] = 1;
+               this->WriteServ("MODE %s :+o", this->nick);
+               FOREACH_MOD(I_OnOper, OnOper(this, opertype));
+               ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
+               strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
+               ServerInstance->all_opers.push_back(this);
+               FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
+       }
 
-        char reason[MAXBUF];
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::Oper()");
+       }
+}
 
-        strlcpy(reason,r,MAXBUF-1);
+void userrec::UnOper()
+{
+       try
+       {
+               if (*this->oper)
+               {
+                       *this->oper = 0;
+                       this->modes[UM_OPERATOR] = 0;
+                       for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
+                       {
+                               if (*a == this)
+                               {
+                                       ServerInstance->Log(DEBUG,"Oper removed from optimization list");
+                                       ServerInstance->all_opers.erase(a);
+                                       return;
+                               }
+                       }
+               }
+       }
 
-        if (strlen(reason)>MAXQUIT)
-        {
-                reason[MAXQUIT-1] = '\0';
-        }
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()");
+       }
+}
 
-        log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
-        Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
-        log(DEBUG,"closing fd %d",user->fd);
+void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason)
+{
+       user_hash::iterator iter = Instance->clientlist.find(user->nick);
+       std::string reason = quitreason;
 
-        if (user->registered == 7) {
-               purge_empty_chans(user);
-                FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
-                WriteCommonExcept(user,"QUIT :%s",reason);
-        }
+       if (reason.length() > MAXQUIT - 1)
+               reason.resize(MAXQUIT - 1);
+       
+       if (IS_LOCAL(user))
+               user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason.c_str());
 
-        user->FlushWriteBuf();
+       if (user->registered == REG_ALL)
+       {
+               user->PurgeEmptyChannels();
+               FOREACH_MOD_I(Instance,I_OnUserQuit,OnUserQuit(user,reason));
+               user->WriteCommonExcept("QUIT :%s",reason.c_str());
+       }
 
-        FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
+       FOREACH_MOD_I(Instance,I_OnUserDisconnect,OnUserDisconnect(user));
 
-        if (user->fd > -1)
-        {
-               if (Config->GetIOHook(user->port))
+       if (IS_LOCAL(user))
+       {
+               if (Instance->Config->GetIOHook(user->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+                               Instance->Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd);
                        }
-                        catch (ModuleException& modexcept)
-                        {
-                                log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
-                        }
-               }
-                ServerInstance->SE->DelFd(user->fd);
-                user->CloseSocket();
-        }
-
-        // this must come before the WriteOpers so that it doesnt try to fill their buffer with anything
-        // if they were an oper with +s.
-        if (user->registered == 7) {
-                // fix by brain: only show local quits because we only show local connects (it just makes SENSE)
-                if (user->fd > -1)
-                        WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
-                AddWhoWas(user);
-        }
-
-        if (iter != clientlist.end())
-        {
-                log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
-                if (user->fd > -1)
-               {
-                        fd_ref_table[user->fd] = NULL;
-                       if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+                       catch (ModuleException& modexcept)
                        {
-                               local_users.erase(find(local_users.begin(),local_users.end(),user));
-                               log(DEBUG,"Delete local user");
+                               Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
                        }
                }
-                clientlist.erase(iter);
-        }
-        delete user;
-}
+               
+               Instance->SE->DelFd(user);
+               user->CloseSocket();
+       }
 
-/* adds or updates an entry in the whowas list */
-void AddWhoWas(userrec* u)
-{
-        whowas_hash::iterator iter = whowas.find(u->nick);
-        WhoWasUser *a = new WhoWasUser();
-        strlcpy(a->nick,u->nick,NICKMAX-1);
-        strlcpy(a->ident,u->ident,IDENTMAX);
-        strlcpy(a->dhost,u->dhost,63);
-        strlcpy(a->host,u->host,63);
-        strlcpy(a->fullname,u->fullname,MAXGECOS);
-       if (u->server)
-               strlcpy(a->server,u->server,256);
-        a->signon = u->signon;
-
-        /* MAX_WHOWAS:   max number of /WHOWAS items
-         * WHOWAS_STALE: number of hours before a WHOWAS item is marked as stale and
-         *               can be replaced by a newer one
-         */
-
-        if (iter == whowas.end())
-        {
-                if (whowas.size() >= (unsigned)WHOWAS_MAX)
-                {
-                        for (whowas_hash::iterator i = whowas.begin(); i != whowas.end(); i++)
-                        {
-                                // 3600 seconds in an hour ;)
-                                if ((i->second->signon)<(TIME-(WHOWAS_STALE*3600)))
-                                {
-                                        // delete an old one
-                                        if (i->second) delete i->second;
-                                       whowas.erase(i);
-                                        // replace with new one
-                                        whowas[a->nick] = a;
-                                        log(DEBUG,"added WHOWAS entry, purged an old record");
-                                        return;
-                                }
-                        }
-                        // no space left and user doesnt exist. Don't leave ram in use!
-                        delete a;
-                }
-                else
-                {
-                        log(DEBUG,"added fresh WHOWAS entry");
-                        whowas[a->nick] = a;
-                }
-        }
-        else
-        {
-                log(DEBUG,"updated WHOWAS entry");
-                if (iter->second) delete iter->second;
-                iter->second = a;
-        }
+       /*
+        * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
+        * if they were an oper with +sn +qQ.
+        */
+       if (user->registered == REG_ALL)
+       {
+               if (IS_LOCAL(user))
+                       Instance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
+               else
+                       Instance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,reason.c_str());
+               user->AddToWhoWas();
+       }
+
+       if (iter != Instance->clientlist.end())
+       {
+               Instance->Log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
+               if (IS_LOCAL(user))
+               {
+                       if (find(Instance->local_users.begin(),Instance->local_users.end(),user) != Instance->local_users.end())
+                               Instance->local_users.erase(find(Instance->local_users.begin(),Instance->local_users.end(),user));
+               }
+               Instance->clientlist.erase(iter);
+               DELETE(user);
+       }
 }
 
-/* add a client connection to the sockets list */
-void AddClient(int socket, int port, bool iscached, in_addr ip4)
+namespace irc
 {
-       std::string tempnick = ConvToStr(socket) + "-unknown";
-       user_hash::iterator iter = clientlist.find(tempnick);
-       const char *ipaddr = inet_ntoa(ip4);
-       int j = 0;
+       namespace whowas
+       {
 
-        // fix by brain.
-        // as these nicknames are 'RFC impossible', we can be sure nobody is going to be
-        // using one as a registered connection. As theyre per fd, we can also safely assume
-        // that we wont have collisions. Therefore, if the nick exists in the list, its only
-        // used by a dead socket, erase the iterator so that the new client may reclaim it.
-        // this was probably the cause of 'server ignores me when i hammer it with reconnects'
-        // issue in earlier alphas/betas
-        if (iter != clientlist.end())
-        {
-                userrec* goner = iter->second;
-                delete goner;
-                clientlist.erase(iter);
-        }
-
-       log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
-       
-        clientlist[tempnick] = new userrec();
-        clientlist[tempnick]->fd = socket;
-        strlcpy(clientlist[tempnick]->nick,tempnick.c_str(),NICKMAX-1);
+               WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
+               {
+                       this->host = strdup(user->host);
+                       this->dhost = strdup(user->dhost);
+                       this->ident = strdup(user->ident);
+                       this->server = user->server;
+                       this->gecos = strdup(user->fullname);
+               }
 
-       /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-       for (char* temp = (char*)ipaddr; *temp && j < 64; temp++, j++)
-               clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = *temp;
-       clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = 0;
+               WhoWasGroup::~WhoWasGroup()
+               {
+                       if (host)
+                               free(host);
+                       if (dhost)
+                               free(dhost);
+                       if (ident)
+                               free(ident);
+                       if (gecos)
+                               free(gecos);
+               }
 
-        clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName);
-       /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-        strcpy(clientlist[tempnick]->ident, "unknown");
-
-        clientlist[tempnick]->registered = 0;
-        clientlist[tempnick]->signon = TIME + Config->dns_timeout;
-        clientlist[tempnick]->lastping = 1;
-       clientlist[tempnick]->ip4 = ip4;
-        clientlist[tempnick]->port = port;
-
-        // set the registration timeout for this user
-        unsigned long class_regtimeout = 90;
-        int class_flood = 0;
-        long class_threshold = 5;
-        long class_sqmax = 262144;      // 256kb
-        long class_rqmax = 4096;        // 4k
-
-        for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
-        {
-                if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str())))
-                {
-                        class_regtimeout = (unsigned long)i->registration_timeout;
-                        class_flood = i->flood;
-                        clientlist[tempnick]->pingmax = i->pingtime;
-                        class_threshold = i->threshold;
-                        class_sqmax = i->sendqmax;
-                        class_rqmax = i->recvqmax;
-                        break;
-                }
-       }
-
-        clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax + Config->dns_timeout;
-        clientlist[tempnick]->timeout = TIME+class_regtimeout;
-        clientlist[tempnick]->flood = class_flood;
-        clientlist[tempnick]->threshold = class_threshold;
-        clientlist[tempnick]->sendqmax = class_sqmax;
-        clientlist[tempnick]->recvqmax = class_rqmax;
-
-        ucrec a;
-        a.channel = NULL;
-        a.uc_modes = 0;
-        for (int i = 0; i < MAXCHANS; i++)
-                clientlist[tempnick]->chans.push_back(a);
-
-       fd_ref_table[socket] = clientlist[tempnick];
-       local_users.push_back(clientlist[tempnick]);
-
-        if (local_users.size() > Config->SoftLimit)
-        {
-                kill_link(clientlist[tempnick],"No more connections allowed");
-                return;
-        }
-
-        if (local_users.size() >= MAXCLIENTS)
-        {
-                kill_link(clientlist[tempnick],"No more connections allowed");
-                return;
-        }
-
-        // this is done as a safety check to keep the file descriptors within range of fd_ref_table.
-        // its a pretty big but for the moment valid assumption:
-        // file descriptors are handed out starting at 0, and are recycled as theyre freed.
-        // therefore if there is ever an fd over 65535, 65536 clients must be connected to the
-        // irc server at once (or the irc server otherwise initiating this many connections, files etc)
-        // which for the time being is a physical impossibility (even the largest networks dont have more
-        // than about 10,000 users on ONE server!)
-        if ((unsigned)socket >= MAX_DESCRIPTORS)
-        {
-                kill_link(clientlist[tempnick],"Server is full");
-                return;
-        }
-        char* e = matches_exception(ipaddr);
-        if (!e)
-        {
-                char* r = matches_zline(ipaddr);
-                if (r)
-                {
-                        char reason[MAXBUF];
-                        snprintf(reason,MAXBUF,"Z-Lined: %s",r);
-                        kill_link(clientlist[tempnick],reason);
-                        return;
-                }
-        }
-
-        ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
-
-       WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname...");
-}
-
-long FindMatchingGlobal(userrec* user)
-{
-       long x = 0;
-       for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
-       {
-               if (a->second->ip4.s_addr == user->ip4.s_addr)
-                       x++;
-       }
-       return x;
-}
-
-long FindMatchingLocal(userrec* user)
-{
-       long x = 0;
-       for (std::vector<userrec*>::const_iterator a = local_users.begin(); a != local_users.end(); a++)
-       {
-               userrec* comp = (userrec*)(*a);
-               if (comp->ip4.s_addr == user->ip4.s_addr)
-                       x++;
-       }
-       return x;
-}
-
-void FullConnectUser(userrec* user, CullList* Goners)
-{
-        ServerInstance->stats->statsConnects++;
-        user->idle_lastmsg = TIME;
-        log(DEBUG,"ConnectUser: %s",user->nick);
-
-       ConnectClass a = GetClass(user);
-       
-       if (a.type == CC_DENY)
-       {
-               Goners->AddItem(user,"Unauthorised connection");
+               /* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */
+               void MaintainWhoWas(InspIRCd* ServerInstance, time_t t)
+               {
+                       for (whowas_users::iterator iter = ServerInstance->whowas.begin(); iter != ServerInstance->whowas.end(); iter++)
+                       {
+                               whowas_set* n = (whowas_set*)iter->second;
+                               if (n->size())
+                               {
+                                       while ((n->begin() != n->end()) && ((*n->begin())->signon < t - ServerInstance->Config->WhoWasMaxKeep))
+                                       {
+                                               WhoWasGroup *a = *(n->begin());
+                                               DELETE(a);
+                                               n->erase(n->begin());
+                                       }
+                               }
+                       }
+               }
+               /* on rehash, refactor maps according to new conf values */
+               void PruneWhoWas(InspIRCd* ServerInstance, time_t t)
+               {
+                       /* config values */
+                       int groupsize = ServerInstance->Config->WhoWasGroupSize;
+                       int maxgroups = ServerInstance->Config->WhoWasMaxGroups;
+                       int maxkeep =   ServerInstance->Config->WhoWasMaxKeep;
+
+                       int groupcount = ServerInstance->whowas.size();
+                       /* iterate whowas_fifo oldest first */
+                       whowas_users_fifo::iterator iter, safeiter;
+                       for (iter = ServerInstance->whowas_fifo.begin(); iter != ServerInstance->whowas_fifo.end(); iter++)
+                       {
+                               /** prune all groups that has expired due to new maxkeep time and
+                                *  also any group number higher than new maxgroups. The oldest are
+                                *  removed first due to iteration over whowas_fifo 
+                                */
+                               if (groupcount > maxgroups || iter->first < t - maxkeep)
+                               {
+                                       whowas_set* n = (whowas_set*)ServerInstance->whowas.find(iter->second)->second;
+                                       if (n->size())
+                                       {
+                                               while (n->begin() != n->end())
+                                               {
+                                                       WhoWasGroup *a = *(n->begin());
+                                                       DELETE(a);
+                                                       n->erase(n->begin());
+                                               }
+                                       }
+                                       ServerInstance->whowas.erase(iter->second);
+                                       /* use a safe iter copy for erase and set the orig iter old valid ref by decrementing it */
+                                       safeiter = iter;
+                                       --iter;
+                                       ServerInstance->whowas_fifo.erase(safeiter);
+                               }
+                               else {
+                                       /* also trim individual groupsizes in case groupsize should have been lowered */
+                                       whowas_set* n = (whowas_set*)ServerInstance->whowas.find(iter->second)->second;
+                                       if (n->size())
+                                       {
+                                               int nickcount = n->size();
+                                               while (n->begin() != n->end() && nickcount > groupsize)
+                                               {
+                                                       WhoWasGroup *a = *(n->begin());
+                                                       DELETE(a);
+                                                       n->erase(n->begin());
+                                                       nickcount--;
+                                               }
+                                       }
+                               }
+                               groupcount--;
+                       }
+               }
+       };
+};
+
+/* adds or updates an entry in the whowas list */
+void userrec::AddToWhoWas()
+{
+       /* if whowas disabled */
+       if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
+       {
+               return;
+       }
+
+       irc::whowas::whowas_users::iterator iter = ServerInstance->whowas.find(this->nick);
+
+       ServerInstance->Log(DEBUG,"Add to whowas lists");
+
+       if (iter == ServerInstance->whowas.end())
+       {
+               ServerInstance->Log(DEBUG,"Adding new whowas set for %s",this->nick);
+               irc::whowas::whowas_set* n = new irc::whowas::whowas_set;
+               irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
+               n->push_back(a);
+               ServerInstance->whowas[this->nick] = n;
+               ServerInstance->whowas_fifo[ServerInstance->Time()] = this->nick;
+               if ((int)(ServerInstance->whowas.size()) > ServerInstance->Config->WhoWasMaxGroups)
+               {
+                       ServerInstance->Log(DEBUG,"Maxgroups of %d reached deleting oldest group '%s'",ServerInstance->Config->WhoWasMaxGroups, ServerInstance->whowas_fifo.begin()->second.c_str());
+                       ServerInstance->whowas.erase(ServerInstance->whowas_fifo.begin()->second);
+                       ServerInstance->whowas_fifo.erase(ServerInstance->whowas_fifo.begin());
+               }
+       }
+       else
+       {
+               irc::whowas::whowas_set* group = (irc::whowas::whowas_set*)iter->second;
+
+               ServerInstance->Log(DEBUG,"Using existing whowas group for %s",this->nick);
+
+               if ((int)(group->size()) >= ServerInstance->Config->WhoWasGroupSize)
+               {
+                       ServerInstance->Log(DEBUG,"Trimming existing group '%s' to %d entries",this->nick, ServerInstance->Config->WhoWasGroupSize);
+                       irc::whowas::WhoWasGroup *a = (irc::whowas::WhoWasGroup*)*(group->begin());
+                       DELETE(a);
+                       group->pop_front();
+               }
+
+               irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
+               group->push_back(a);
+       }
+}
+
+/* add a client connection to the sockets list */
+void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, insp_inaddr ip)
+{
+       std::string tempnick = ConvToStr(socket) + "-unknown";
+       user_hash::iterator iter = Instance->clientlist.find(tempnick);
+       const char *ipaddr = insp_ntoa(ip);
+       userrec* New;
+       int j = 0;
+
+       /*
+        * fix by brain.
+        * as these nicknames are 'RFC impossible', we can be sure nobody is going to be
+        * using one as a registered connection. As they are per fd, we can also safely assume
+        * that we wont have collisions. Therefore, if the nick exists in the list, its only
+        * used by a dead socket, erase the iterator so that the new client may reclaim it.
+        * this was probably the cause of 'server ignores me when i hammer it with reconnects'
+        * issue in earlier alphas/betas
+        */
+       if (iter != Instance->clientlist.end())
+       {
+               userrec* goner = iter->second;
+               DELETE(goner);
+               Instance->clientlist.erase(iter);
+       }
+
+       Instance->Log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
+
+       New = new userrec(Instance);
+       Instance->clientlist[tempnick] = New;
+       New->fd = socket;
+       strlcpy(New->nick,tempnick.c_str(),NICKMAX-1);
+
+       New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
+       /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
+       strcpy(New->ident, "unknown");
+
+       New->registered = REG_NONE;
+       New->signon = Instance->Time() + Instance->Config->dns_timeout;
+       New->lastping = 1;
+
+       New->SetSockAddr(AF_FAMILY, ipaddr, port);
+
+       /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
+       for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
+               New->dhost[j] = New->host[j] = *temp;
+       New->dhost[j] = New->host[j] = 0;
+
+       Instance->AddLocalClone(New);
+       Instance->AddGlobalClone(New);
+
+       // set the registration timeout for this user
+       unsigned long class_regtimeout = 90;
+       int class_flood = 0;
+       long class_threshold = 5;
+       long class_sqmax = 262144;      // 256kb
+       long class_rqmax = 4096;        // 4k
+
+       for (ClassVector::iterator i = Instance->Config->Classes.begin(); i != Instance->Config->Classes.end(); i++)
+       {
+               if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str(),true)))
+               {
+                       class_regtimeout = (unsigned long)i->registration_timeout;
+                       class_flood = i->flood;
+                       New->pingmax = i->pingtime;
+                       class_threshold = i->threshold;
+                       class_sqmax = i->sendqmax;
+                       class_rqmax = i->recvqmax;
+                       break;
+               }
+       }
+
+       New->nping = Instance->Time() + New->pingmax + Instance->Config->dns_timeout;
+       New->timeout = Instance->Time() + class_regtimeout;
+       New->flood = class_flood;
+       New->threshold = class_threshold;
+       New->sendqmax = class_sqmax;
+       New->recvqmax = class_rqmax;
+
+       Instance->local_users.push_back(New);
+
+       if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
+       {
+               Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
+               userrec::QuitUser(Instance, New,"No more connections allowed");
+               return;
+       }
+
+       /*
+        * XXX -
+        * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
+        * its a pretty big but for the moment valid assumption:
+        * file descriptors are handed out starting at 0, and are recycled as theyre freed.
+        * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
+        * irc server at once (or the irc server otherwise initiating this many connections, files etc)
+        * which for the time being is a physical impossibility (even the largest networks dont have more
+        * than about 10,000 users on ONE server!)
+        */
+       if ((unsigned int)socket >= MAX_DESCRIPTORS)
+       {
+               userrec::QuitUser(Instance, New, "Server is full");
+               return;
+       }
+
+       New->exempt = (Instance->XLines->matches_exception(New) != NULL);
+       if (!New->exempt)
+       {
+               ZLine* r = Instance->XLines->matches_zline(ipaddr);
+               if (r)
+               {
+                       char reason[MAXBUF];
+                       snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
+                       userrec::QuitUser(Instance, New, reason);
+                       return;
+               }
+       }
+
+       if (socket > -1)
+       {
+               if (!Instance->SE->AddFd(New))
+               {
+                       userrec::QuitUser(Instance, New, "Internal error handling connection");
+                       return;
+               }
+       }
+
+       /* NOTE: even if dns lookups are *off*, we still need to display this.
+        * BOPM and other stuff requires it.
+        */
+       New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
+}
+
+long userrec::GlobalCloneCount()
+{
+       clonemap::iterator x = ServerInstance->global_clones.find(this->GetIPString());
+       if (x != ServerInstance->global_clones.end())
+               return x->second;
+       else
+               return 0;
+}
+
+long userrec::LocalCloneCount()
+{
+       clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
+       if (x != ServerInstance->local_clones.end())
+               return x->second;
+       else
+               return 0;
+}
+
+void userrec::FullConnect(CullList* Goners)
+{
+       ServerInstance->stats->statsConnects++;
+       this->idle_lastmsg = ServerInstance->Time();
+
+       ConnectClass a = this->GetClass();
+
+       if (a.type == CC_DENY)
+       {
+               Goners->AddItem(this,"Unauthorised connection");
+               return;
+       }
+       
+       if ((*(a.pass.c_str())) && (!this->haspassed))
+       {
+               Goners->AddItem(this,"Invalid password");
                return;
        }
-       if ((*(a.pass.c_str())) && (!user->haspassed))
-        {
-               Goners->AddItem(user,"Invalid password");
-                return;
-        }
-       if (FindMatchingLocal(user) > a.maxlocal)
+       
+       if (this->LocalCloneCount() > a.maxlocal)
        {
-               Goners->AddItem(user,"No more connections allowed from your host via this connect class (local)");
-               WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s",a.maxlocal,(char*)inet_ntoa(user->ip4));
+               Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)");
+               ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString());
                return;
        }
-       else if (FindMatchingGlobal(user) > a.maxglobal)
+       else if (this->GlobalCloneCount() > a.maxglobal)
        {
-               Goners->AddItem(user,"No more connections allowed from your host via this connect class (global)");
-               WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal,(char*)inet_ntoa(user->ip4));
+               Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)");
+               ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString());
                return;
        }
 
-        char match_against[MAXBUF];
-        snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
-        char* e = matches_exception(match_against);
-        if (!e)
-        {
-                char* r = matches_gline(match_against);
-                if (r)
-                {
-                        char reason[MAXBUF];
-                        snprintf(reason,MAXBUF,"G-Lined: %s",r);
-                       Goners->AddItem(user,reason);
-                        return;
-                }
-                r = matches_kline(user->host);
-                if (r)
-                {
-                        char reason[MAXBUF];
-                        snprintf(reason,MAXBUF,"K-Lined: %s",r);
-                        Goners->AddItem(user,reason);
-                        return;
-                }
-        }
-
-
-        WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Config->Network);
-        WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Config->Network,user->nick,user->ident,user->host);
-        WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,Config->ServerName,VERSION);
-        WriteServ(user->fd,"003 %s :This server was created %s %s",user->nick,__TIME__,__DATE__);
-        WriteServ(user->fd,"004 %s %s %s iowghrasxRVSCWBG lvhopsmntikrcaqbegIOLQRSKVHGCNT vhobeIaqglk",user->nick,Config->ServerName,VERSION);
-        // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
-        // so i'd better split it :)
-        std::stringstream out(Config->data005);
-        std::string token = "";
-        std::string line5 = "";
-        int token_counter = 0;
-        while (!out.eof())
-        {
-                out >> token;
-                line5 = line5 + token + " ";
-                token_counter++;
-                if ((token_counter >= 13) || (out.eof() == true))
-                {
-                        WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
-                        line5 = "";
-                        token_counter = 0;
-                }
-        }
-        ShowMOTD(user);
-
-        // fix 3 by brain, move registered = 7 below these so that spurious modes and host changes dont go out
-        // onto the network and produce 'fake direction'
-        FOREACH_MOD(I_OnUserConnect,OnUserConnect(user));
-        FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(user));
-        user->registered = 7;
-        WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,(char*)inet_ntoa(user->ip4));
-}
-
-/* re-allocates a nick in the user_hash after they change nicknames,
- * returns a pointer to the new user as it may have moved */
-
-userrec* ReHashNick(char* Old, char* New)
-{
-        //user_hash::iterator newnick;
-        user_hash::iterator oldnick = clientlist.find(Old);
-
-        log(DEBUG,"ReHashNick: %s %s",Old,New);
-
-        if (!strcasecmp(Old,New))
-        {
-                log(DEBUG,"old nick is new nick, skipping");
-                return oldnick->second;
-        }
-
-        if (oldnick == clientlist.end()) return NULL; /* doesnt exist */
-
-        log(DEBUG,"ReHashNick: Found hashed nick %s",Old);
-
-        userrec* olduser = oldnick->second;
-        clientlist[New] = olduser;
-        clientlist.erase(oldnick);
-
-        log(DEBUG,"ReHashNick: Nick rehashed as %s",New);
-
-        return clientlist[New];
-}
-
-void force_nickchange(userrec* user,const char* newnick)
-{
-        char nick[MAXBUF];
-        int MOD_RESULT = 0;
-
-        *nick = 0;
-
-        FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,newnick));
-        if (MOD_RESULT) {
-                ServerInstance->stats->statsCollisions++;
-                kill_link(user,"Nickname collision");
-                return;
-        }
-        if (matches_qline(newnick))
-        {
-               ServerInstance->stats->statsCollisions++;
-                kill_link(user,"Nickname collision");
-                return;
-        }
-
-        if (user)
-        {
-                if (newnick)
-                {
-                        strlcpy(nick,newnick,MAXBUF-1);
-                }
-                if (user->registered == 7)
-                {
-                        char* pars[1];
-                        pars[0] = nick;
+       if (!this->exempt)
+       {
+               GLine* r = ServerInstance->XLines->matches_gline(this);
+               
+               if (r)
+               {
+                       char reason[MAXBUF];
+                       snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
+                       Goners->AddItem(this, reason);
+                       return;
+               }
+               
+               KLine* n = ServerInstance->XLines->matches_kline(this);
+               
+               if (n)
+               {
+                       char reason[MAXBUF];
+                       snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
+                       Goners->AddItem(this, reason);
+                       return;
+               }
+       }
+
+
+       this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
+       this->WriteServ("001 %s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
+       this->WriteServ("002 %s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
+       this->WriteServ("003 %s :This server was created %s %s", this->nick, __TIME__, __DATE__);
+       this->WriteServ("004 %s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+
+       // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
+       // so i'd better split it :)
+       std::stringstream out(ServerInstance->Config->data005);
+       std::string token = "";
+       std::string line5 = "";
+       int token_counter = 0;
+       
+       while (!out.eof())
+       {
+               out >> token;
+               line5 = line5 + token + " ";
+               token_counter++;
+               
+               if ((token_counter >= 13) || (out.eof() == true))
+               {
+                       this->WriteServ("005 %s %s:are supported by this server", this->nick, line5.c_str());
+                       line5 = "";
+                       token_counter = 0;
+               }
+       }
+       
+       this->ShowMOTD();
+
+       /*
+        * fix 3 by brain, move registered = 7 below these so that spurious modes and host
+        * changes dont go out onto the network and produce 'fake direction'.
+        */
+       FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
+
+       this->registered = REG_ALL;
+
+       FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
+       ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
+}
+
+/** userrec::UpdateNick()
+ * re-allocates a nick in the user_hash after they change nicknames,
+ * returns a pointer to the new user as it may have moved
+ */
+userrec* userrec::UpdateNickHash(const char* New)
+{
+       try
+       {
+               //user_hash::iterator newnick;
+               user_hash::iterator oldnick = ServerInstance->clientlist.find(this->nick);
+
+               if (!strcasecmp(this->nick,New))
+                       return oldnick->second;
+
+               if (oldnick == ServerInstance->clientlist.end())
+                       return NULL; /* doesnt exist */
+
+               userrec* olduser = oldnick->second;
+               ServerInstance->clientlist[New] = olduser;
+               ServerInstance->clientlist.erase(oldnick);
+               return ServerInstance->clientlist[New];
+       }
+
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()");
+               return NULL;
+       }
+}
+
+bool userrec::ForceNickChange(const char* newnick)
+{
+       try
+       {
+               int MOD_RESULT = 0;
+       
+               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+
+               if (MOD_RESULT)
+               {
+                       ServerInstance->stats->statsCollisions++;
+                       return false;
+               }
+       
+               if (ServerInstance->XLines->matches_qline(newnick))
+               {
+                       ServerInstance->stats->statsCollisions++;
+                       return false;
+               }
+
+               if (this->registered == REG_ALL)
+               {
+                       const char* pars[1];
+                       pars[0] = newnick;
                        std::string cmd = "NICK";
-                        ServerInstance->Parser->CallHandler(cmd,pars,1,user);
-                }
-        }
+                       return (ServerInstance->Parser->CallHandler(cmd, pars, 1, this) == CMD_SUCCESS);
+               }
+               return false;
+       }
+
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()");
+               return false;
+       }
+}
+
+void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
+{
+       switch (protocol_family)
+       {
+#ifdef SUPPORT_IP6LINKS
+               case AF_INET6:
+               {
+                       ServerInstance->Log(DEBUG,"Set inet6 protocol address");
+                       sockaddr_in6* sin = new sockaddr_in6;
+                       sin->sin6_family = AF_INET6;
+                       sin->sin6_port = port;
+                       inet_pton(AF_INET6, ip, &sin->sin6_addr);
+                       this->ip = (sockaddr*)sin;
+               }
+               break;
+#endif
+               case AF_INET:
+               {
+                       ServerInstance->Log(DEBUG,"Set inet4 protocol address");
+                       sockaddr_in* sin = new sockaddr_in;
+                       sin->sin_family = AF_INET;
+                       sin->sin_port = port;
+                       inet_pton(AF_INET, ip, &sin->sin_addr);
+                       this->ip = (sockaddr*)sin;
+               }
+               break;
+               default:
+                       ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+               break;
+       }
+}
+
+int userrec::GetPort()
+{
+       if (this->ip == NULL)
+               return 0;
+
+       switch (this->GetProtocolFamily())
+       {
+#ifdef SUPPORT_IP6LINKS
+               case AF_INET6:
+               {
+                       sockaddr_in6* sin = (sockaddr_in6*)this->ip;
+                       return sin->sin6_port;
+               }
+               break;
+#endif
+               case AF_INET:
+               {
+                       sockaddr_in* sin = (sockaddr_in*)this->ip;
+                       return sin->sin_port;
+               }
+               break;
+               default:
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+               break;
+       }
+       return 0;
+}
+
+int userrec::GetProtocolFamily()
+{
+       if (this->ip == NULL)
+               return 0;
+
+       sockaddr_in* sin = (sockaddr_in*)this->ip;
+       return sin->sin_family;
+}
+
+const char* userrec::GetIPString()
+{
+       static char buf[1024];
+
+       if (this->ip == NULL)
+               return "";
+
+       switch (this->GetProtocolFamily())
+       {
+#ifdef SUPPORT_IP6LINKS
+               case AF_INET6:
+               {
+                       static char temp[1024];
+               
+                       sockaddr_in6* sin = (sockaddr_in6*)this->ip;
+                       inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
+                       /* IP addresses starting with a : on irc are a Bad Thing (tm) */
+                       if (*buf == ':')
+                       {
+                               strlcpy(&temp[1], buf, sizeof(temp) - 1);
+                               *temp = '0';
+                               return temp;
+                       }
+                       return buf;
+               }
+               break;
+#endif
+               case AF_INET:
+               {
+                       sockaddr_in* sin = (sockaddr_in*)this->ip;
+                       inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
+                       return buf;
+               }
+               break;
+               default:
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+               break;
+       }
+       return "";
+}
+
+const char* userrec::GetIPString(char* buf)
+{
+       if (this->ip == NULL)
+       {
+               *buf = 0;
+               return buf;
+       }
+
+       switch (this->GetProtocolFamily())
+       {
+#ifdef SUPPORT_IP6LINKS
+               case AF_INET6:
+               {
+                       static char temp[1024];
+               
+                       sockaddr_in6* sin = (sockaddr_in6*)this->ip;
+                       inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
+                       /* IP addresses starting with a : on irc are a Bad Thing (tm) */
+                       if (*buf == ':')
+                       {
+                               strlcpy(&temp[1], buf, sizeof(temp) - 1);
+                               *temp = '0';
+                               strlcpy(buf, temp, sizeof(temp));
+                       }
+                       return buf;
+               }
+               break;
+#endif
+               case AF_INET:
+               {
+                       sockaddr_in* sin = (sockaddr_in*)this->ip;
+                       inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
+                       return buf;
+               }
+               break;
+
+               default:
+                       ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
+               break;
+       }
+       return "";
+}
+
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
+void userrec::Write(std::string text)
+{
+       if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
+               return;
+
+       try
+       {
+               text.append("\r\n");
+       }
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+               return;
+       }
+
+       if (ServerInstance->Config->GetIOHook(this->GetPort()))
+       {
+               try
+               {
+                       ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
+               }
+               catch (ModuleException& modexcept)
+               {
+                       ServerInstance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+               }
+       }
+       else
+       {
+               this->AddWriteBuf(text);
+       }
+       ServerInstance->stats->statsSent += text.length();
+       this->ServerInstance->SE->WantWrite(this);
+}
+
+/** Write()
+ */
+void userrec::Write(const char *text, ...)
+{
+       va_list argsPtr;
+       char textbuffer[MAXBUF];
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->Write(std::string(textbuffer));
+}
+
+void userrec::WriteServ(const std::string& text)
+{
+       char textbuffer[MAXBUF];
+
+       snprintf(textbuffer,MAXBUF,":%s %s",ServerInstance->Config->ServerName,text.c_str());
+       this->Write(std::string(textbuffer));
+}
+
+/** WriteServ()
+ *  Same as Write(), except `text' is prefixed with `:server.name '.
+ */
+void userrec::WriteServ(const char* text, ...)
+{
+       va_list argsPtr;
+       char textbuffer[MAXBUF];
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteServ(std::string(textbuffer));
 }
 
+
+void userrec::WriteFrom(userrec *user, const std::string &text)
+{
+       char tb[MAXBUF];
+
+       snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+       
+       this->Write(std::string(tb));
+}
+
+
+/* write text from an originating user to originating user */
+
+void userrec::WriteFrom(userrec *user, const char* text, ...)
+{
+       va_list argsPtr;
+       char textbuffer[MAXBUF];
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteFrom(user, std::string(textbuffer));
+}
+
+
+/* write text to an destination user from a source user (e.g. user privmsg) */
+
+void userrec::WriteTo(userrec *dest, const char *data, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, data);
+       vsnprintf(textbuffer, MAXBUF, data, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteTo(dest, std::string(textbuffer));
+}
+
+void userrec::WriteTo(userrec *dest, const std::string &data)
+{
+       dest->WriteFrom(this, data);
+}
+
+
+void userrec::WriteCommon(const char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (this->registered != REG_ALL)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteCommon(std::string(textbuffer));
+}
+
+void userrec::WriteCommon(const std::string &text)
+{
+       try
+       {
+               bool sent_to_at_least_one = false;
+       
+               if (this->registered != REG_ALL)
+                       return;
+       
+               uniq_id++;
+       
+               for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+               {
+                       ucrec *n = *v;
+                       if (n->channel)
+                       {
+                               CUList *ulist= n->channel->GetUsers();
+               
+                               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+                               {
+                                       if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
+                                       {
+                                               already_sent[i->second->fd] = uniq_id;
+                                               i->second->WriteFrom(this, std::string(text));
+                                               sent_to_at_least_one = true;
+                                       }
+                               }
+                       }
+               }
+       
+               /*
+                * if the user was not in any channels, no users will receive the text. Make sure the user
+                * receives their OWN message for WriteCommon
+                */
+               if (!sent_to_at_least_one)
+               {
+                       this->WriteFrom(this,std::string(text));
+               }
+       }
+
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()");
+       }
+}
+
+
+/* write a formatted string to all users who share at least one common
+ * channel, NOT including the source user e.g. for use in QUIT
+ */
+
+void userrec::WriteCommonExcept(const char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteCommonExcept(std::string(textbuffer));
+}
+
+void userrec::WriteCommonExcept(const std::string &text)
+{
+       bool quit_munge = false;
+       char oper_quit[MAXBUF];
+       char textbuffer[MAXBUF];
+
+       strlcpy(textbuffer, text.c_str(), MAXBUF);
+
+       if (this->registered != REG_ALL)
+               return;
+
+       uniq_id++;
+
+       /* TODO: We need some form of WriteCommonExcept that will send two lines, one line to
+        * opers and the other line to non-opers, then all this hidebans and hidesplits gunk
+        * can go byebye.
+        */
+       if (ServerInstance->Config->HideSplits)
+       {
+               char* check = textbuffer + 6;
+
+               if (!strncasecmp(textbuffer, "QUIT :",6))
+               {
+                       std::stringstream split(check);
+                       std::string server_one;
+                       std::string server_two;
+
+                       split >> server_one;
+                       split >> server_two;
+
+                       if ((ServerInstance->FindServerName(server_one)) && (ServerInstance->FindServerName(server_two)))
+                       {
+                               strlcpy(oper_quit,textbuffer,MAXQUIT);
+                               strlcpy(check,"*.net *.split",MAXQUIT);
+                               quit_munge = true;
+                       }
+               }
+       }
+
+       if ((ServerInstance->Config->HideBans) && (!quit_munge))
+       {
+               if ((!strncasecmp(textbuffer, "QUIT :G-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :K-Lined:",14))
+               || (!strncasecmp(textbuffer, "QUIT :Q-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :Z-Lined:",14)))
+               {
+                       char* check = textbuffer + 13;
+                       strlcpy(oper_quit,textbuffer,MAXQUIT);
+                       *check = 0;  // We don't need to strlcpy, we just chop it from the :
+                       quit_munge = true;
+               }
+       }
+
+       for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+       {
+               ucrec* n = *v;
+               if (n->channel)
+               {
+                       CUList *ulist= n->channel->GetUsers();
+
+                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+                       {
+                               if (this != i->second)
+                               {
+                                       if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
+                                       {
+                                               already_sent[i->second->fd] = uniq_id;
+                                               if (quit_munge)
+                                                       i->second->WriteFrom(this, *i->second->oper ? std::string(oper_quit) : std::string(textbuffer));
+                                               else
+                                                       i->second->WriteFrom(this, std::string(textbuffer));
+                                       }
+                               }
+                       }
+               }
+       }
+
+}
+
+void userrec::WriteWallOps(const std::string &text)
+{
+       /* Does nothing if theyre not opered */
+       if ((!*this->oper) && (IS_LOCAL(this)))
+               return;
+
+       std::string wallop = "WALLOPS :";
+
+       try
+       {
+               wallop.append(text);
+       }
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+               return;
+       }
+
+       for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+       {
+               userrec* t = *i;
+               if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
+                       this->WriteTo(t,wallop);
+       }
+}
+
+void userrec::WriteWallOps(const char* text, ...)
+{       
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);                
+                                       
+       this->WriteWallOps(std::string(textbuffer));
+}                                     
+
+/* 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)
+ *
+ * The old algorithm in 1.0 for this was relatively inefficient, iterating over
+ * the first users channels then the second users channels within the outer loop,
+ * therefore it was a maximum of x*y iterations (upon returning 0 and checking
+ * all possible iterations). However this new function instead checks against the
+ * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * and saves us time as we already know what pointer value we are after.
+ * Don't quote me on the maths as i am not a mathematician or computer scientist,
+ * but i believe this algorithm is now x+(log y) maximum iterations instead.
+ */
+bool userrec::SharesChannelWith(userrec *other)
+{
+       if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
+               return false;
+
+       /* Outer loop */
+       for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+       {
+               /* Fetch the channel from the user */
+               ucrec* user_channel = *i;
+
+               if (user_channel->channel)
+               {
+                       /* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
+                        * by replacing it with a map::find which *should* be more efficient
+                        */
+                       if (user_channel->channel->HasUser(other))
+                               return true;
+               }
+       }
+       return false;
+}
+
+int userrec::CountChannels()
+{
+       return ChannelCount;
+}
+
+void userrec::ModChannelCount(int n)
+{
+       ChannelCount += n;
+}
+
+bool userrec::ChangeName(const char* gecos)
+{
+       if (!strcmp(gecos, this->fullname))
+               return true;
+
+       if (IS_LOCAL(this))
+       {
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(this,gecos));
+               if (MOD_RESULT)
+                       return false;
+               FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
+       }
+       strlcpy(this->fullname,gecos,MAXGECOS+1);
+       return true;
+}
+
+bool userrec::ChangeDisplayedHost(const char* host)
+{
+       if (!strcmp(host, this->dhost))
+               return true;
+
+       if (IS_LOCAL(this))
+       {
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,host));
+               if (MOD_RESULT)
+                       return false;
+               FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
+       }
+       if (this->ServerInstance->Config->CycleHosts)
+               this->WriteCommonExcept("QUIT :Changing hosts");
+
+       /* Fix by Om: userrec::dhost is 65 long, this was truncating some long hosts */
+       strlcpy(this->dhost,host,64);
+
+       if (this->ServerInstance->Config->CycleHosts)
+       {
+               for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+               {
+                       if ((*i)->channel)
+                       {
+                               (*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
+                               std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+                               if (n.length() > 0)
+                                       (*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
+                       }
+               }
+       }
+
+       if (IS_LOCAL(this))
+               this->WriteServ("396 %s %s :is now your hidden host",this->nick,this->dhost);
+
+       return true;
+}
+
+bool userrec::ChangeIdent(const char* newident)
+{
+       if (!strcmp(newident, this->ident))
+               return true;
+
+       if (this->ServerInstance->Config->CycleHosts)
+               this->WriteCommonExcept("%s","QUIT :Changing ident");
+
+       strlcpy(this->ident, newident, IDENTMAX+2);
+
+       if (this->ServerInstance->Config->CycleHosts)
+       {
+               for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+               {
+                       if ((*i)->channel)
+                       {
+                               (*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
+                               std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+                               if (n.length() > 0)
+                                       (*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
+                       }
+               }
+       }
+
+       return true;
+}
+
+void userrec::NoticeAll(char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+
+       for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+       {
+               userrec* t = *i;
+               t->WriteFrom(this, std::string(formatbuffer));
+       }
+}
+
+
+std::string userrec::ChannelList(userrec* source)
+{
+       try
+       {
+               std::string list;
+               for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+               {
+                       ucrec* rec = *i;
+       
+                       if(rec->channel && rec->channel->name)
+                       {
+                               /* If the target is the same as the sender, let them see all their channels.
+                                * If the channel is NOT private/secret OR the user shares a common channel
+                                * If the user is an oper, and the <options:operspywhois> option is set.
+                                */
+                               if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
+                               {
+                                       list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
+                               }
+                       }
+               }
+               return list;
+       }
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()");
+               return "";
+       }
+}
+
+void userrec::SplitChanList(userrec* dest, const std::string &cl)
+{
+       std::string line;
+       std::ostringstream prefix;
+       std::string::size_type start, pos, length;
+
+       try
+       {
+               prefix << this->nick << " " << dest->nick << " :";
+               line = prefix.str();
+               int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+       
+               for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+               {
+                       length = (pos == std::string::npos) ? cl.length() : pos;
+       
+                       if (line.length() + namelen + length - start > 510)
+                       {
+                               ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+                               line = prefix.str();
+                       }
+       
+                       if(pos == std::string::npos)
+                       {
+                               line.append(cl.substr(start, length - start));
+                               break;
+                       }
+                       else
+                       {
+                               line.append(cl.substr(start, length - start + 1));
+                       }
+               }
+       
+               if (line.length())
+               {
+                       ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+               }
+       }
+
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()");
+       }
+}
+
+
+/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass& userrec::GetClass()
+{
+       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+       {
+               if ((match(this->GetIPString(),i->host.c_str(),true)) || (match(this->host,i->host.c_str())))
+                       return *i;
+       }
+
+       return *(ServerInstance->Config->Classes.begin());
+}
+
+void userrec::PurgeEmptyChannels()
+{
+       std::vector<chanrec*> to_delete;
+
+       // firstly decrement the count on each channel
+       for (std::vector<ucrec*>::iterator f = this->chans.begin(); f != this->chans.end(); f++)
+       {
+               ucrec* uc = *f;
+               if (uc->channel)
+               {
+                       uc->channel->RemoveAllPrefixes(this);
+                       if (uc->channel->DelUser(this) == 0)
+                       {
+                               /* No users left in here, mark it for deletion */
+                               try
+                               {
+                                       to_delete.push_back(uc->channel);
+                               }
+                               catch (...)
+                               {
+                                       ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()");
+                               }
+                               uc->channel = NULL;
+                       }
+               }
+       }
+
+       for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+       {
+               chanrec* thischan = *n;
+               chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
+               if (i2 != ServerInstance->chanlist.end())
+               {
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
+                       DELETE(i2->second);
+                       ServerInstance->chanlist.erase(i2);
+               }
+       }
+
+       this->UnOper();
+}
+
+void userrec::ShowMOTD()
+{
+       if (!ServerInstance->Config->MOTD.size())
+       {
+               this->WriteServ("422 %s :Message of the day file is missing.",this->nick);
+               return;
+       }
+       this->WriteServ("375 %s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               this->WriteServ("372 %s :- %s",this->nick,ServerInstance->Config->MOTD[i].c_str());
+
+       this->WriteServ("376 %s :End of message of the day.", this->nick);
+}
+
+void userrec::ShowRULES()
+{
+       if (!ServerInstance->Config->RULES.size())
+       {
+               this->WriteServ("NOTICE %s :Rules file is missing.",this->nick);
+               return;
+       }
+       this->WriteServ("NOTICE %s :%s rules",this->nick,ServerInstance->Config->ServerName);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               this->WriteServ("NOTICE %s :%s",this->nick,ServerInstance->Config->RULES[i].c_str());
+
+       this->WriteServ("NOTICE %s :End of %s rules.",this->nick,ServerInstance->Config->ServerName);
+}
+
+void userrec::HandleEvent(EventType et, int errornum)
+{
+       /* WARNING: May delete this user! */
+       try
+       {
+               switch (et)
+               {
+                       case EVENT_READ:
+                               ServerInstance->ProcessUser(this);
+                       break;
+                       case EVENT_WRITE:
+                               this->FlushWriteBuf();
+                       break;
+                       case EVENT_ERROR:
+                               /** This should be safe, but dont DARE do anything after it -- Brain */
+                               userrec::QuitUser(ServerInstance, this, errornum ? strerror(errornum) : "EOF from client");
+                       break;
+               }
+       }
+       catch (...)
+       {
+               ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted");
+       }
+}