]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/users.cpp
Remove some debug
[user/henk/code/inspircd.git] / src / users.cpp
index b4d7f15dcfe2e1282d91e3baf1e2437c93cb7b98..9b47ea87c55fcabf969fbffb8ed811892de516c3 100644 (file)
@@ -19,7 +19,7 @@
 #include "socketengine.h"
 #include "wildcard.h"
 #include "xline.h"
-#include "cull_list.h"
+#include "commands/cmd_whowas.h"
 
 static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
 
@@ -30,15 +30,13 @@ 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;
 }
@@ -53,7 +51,7 @@ bool InitClasses(ServerConfig* conf, const char* tag)
                                delete[] n->second;
                }
        }
-       
+
        conf->operclass.clear();
        return true;
 }
@@ -62,9 +60,8 @@ bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &valu
 {
        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;
 }
 
@@ -72,9 +69,8 @@ bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        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;
 }
 
@@ -89,12 +85,8 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
        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 '+':
@@ -146,12 +138,11 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
 
 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);
+               bool cached;
+               res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+               this->ServerInstance->AddResolver(res_reverse, cached);
        }
        catch (CoreException& e)
        {
@@ -159,31 +150,41 @@ void userrec::StartDNSLookup()
        }
 }
 
-UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt) :
-       Resolver(Instance, to_resolve, qt), bound_user(user)
+UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache) :
+       Resolver(Instance, to_resolve, qt, cache), bound_user(user)
 {
        this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
        this->bound_fd = user->GetFd();
 }
 
-void UserResolver::OnLookupComplete(const std::string &result)
+void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 {
        if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
-               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)
                        {
+                               bool cached;
 #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));
+                               if (this->bound_user->GetProtocolFamily() == AF_INET6)
+                               {
+                                       /* IPV6 forward lookup (with possibility of 4in6) */
+                                       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), cached);
+                               }
+                               else
+                               {
+                                       /* IPV4 lookup (mixed protocol mode) */
+                                       bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached);
+                               }
 #else
-                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A);
+                               /* IPV4 lookup (ipv4 only mode) */
+                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached);
 #endif
-                               this->ServerInstance->AddResolver(bound_user->res_forward);
+                               this->ServerInstance->AddResolver(bound_user->res_forward, cached);
                        }
                }
                catch (CoreException& e)
@@ -208,7 +209,7 @@ void UserResolver::OnLookupComplete(const std::string &result)
                                        if (*(hostname.c_str()) == ':')
                                                hostname = "0" + hostname;
 
-                                       this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
+                                       this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
                                        this->bound_user->dns_done = true;
                                        strlcpy(this->bound_user->dhost, hostname.c_str(),64);
                                        strlcpy(this->bound_user->host, hostname.c_str(),64);
@@ -289,9 +290,21 @@ const char* userrec::FormatModes()
        return data;
 }
 
+void userrec::DecrementModes()
+{
+       for (int n = 0; n < 64; n++)
+       {
+               if (modes[n])
+               {
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(n+65, MODETYPE_USER);
+                       if (mh)
+                               mh->ChangeCount(-1);
+               }
+       }
+}
+
 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 = *awaymsg = *oper = 0;
        server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
@@ -317,7 +330,7 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
 userrec::~userrec()
 {
        this->InvalidateCache();
-
+       this->DecrementModes();
        if (ip)
        {
                clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
@@ -329,7 +342,7 @@ userrec::~userrec()
                                ServerInstance->local_clones.erase(x);
                        }
                }
-       
+
                clonemap::iterator y = ServerInstance->global_clones.find(this->GetIPString());
                if (y != ServerInstance->global_clones.end())
                {
@@ -398,7 +411,7 @@ void userrec::CloseSocket()
        shutdown(this->fd,2);
        close(this->fd);
 }
+
 char* userrec::GetFullHost()
 {
        if (this->cached_fullhost)
@@ -490,7 +503,6 @@ void userrec::InviteTo(const irc::string &channel)
 
 void userrec::RemoveInvite(const irc::string &channel)
 {
-       ServerInstance->Log(DEBUG,"Removing invites");
        for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
        {
                if (channel == *i)
@@ -506,7 +518,7 @@ 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.
@@ -516,7 +528,7 @@ bool userrec::HasPermission(const std::string &command)
         */
        if (!IS_LOCAL(this))
                return true;
-       
+
        // are they even an oper at all?
        if (*this->oper)
        {
@@ -563,7 +575,7 @@ bool userrec::AddBuffer(std::string a)
        try
        {
                std::string::size_type i = a.rfind('\r');
-       
+
                while (i != std::string::npos)
                {
                        a.erase(i, 1);
@@ -572,14 +584,14 @@ bool userrec::AddBuffer(std::string a)
 
                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;
        }
 
@@ -606,14 +618,14 @@ std::string userrec::GetBuffer()
        {
                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
@@ -640,7 +652,7 @@ void userrec::AddWriteBuf(const std::string &data)
 {
        if (*this->GetWriteError())
                return;
-       
+
        if (sendq.length() + data.length() > (unsigned)this->sendqmax)
        {
                /*
@@ -653,7 +665,7 @@ void userrec::AddWriteBuf(const std::string &data)
                return;
        }
 
-       try 
+       try
        {
                if (data.length() > 512)
                        sendq.append(data.substr(0,510)).append("\r\n");
@@ -687,7 +699,6 @@ void userrec::FlushWriteBuf()
                                        /* The socket buffer is full. This isnt fatal,
                                         * try again later.
                                         */
-                                       ServerInstance->Log(DEBUG,"EAGAIN, want write");
                                        this->ServerInstance->SE->WantWrite(this);
                                }
                                else
@@ -707,10 +718,7 @@ void userrec::FlushWriteBuf()
                                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);
-                               }
                        }
                }
        }
@@ -727,10 +735,7 @@ void userrec::SetWriteError(const std::string &error)
        {
                // don't try to set the error twice, its already set take the first string.
                if (this->WriteError.empty())
-               {
-                       ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
                        this->WriteError = error;
-               }
        }
 
        catch (...)
@@ -775,7 +780,6 @@ void userrec::UnOper()
                        {
                                if (*a == this)
                                {
-                                       ServerInstance->Log(DEBUG,"Oper removed from optimization list");
                                        ServerInstance->all_opers.erase(a);
                                        return;
                                }
@@ -791,229 +795,36 @@ void userrec::UnOper()
 
 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 (reason.length() > MAXQUIT - 1)
-               reason.resize(MAXQUIT - 1);
-
-       if (user->registered != REG_ALL)
-               if (Instance->unregistered_count)
-                       Instance->unregistered_count--;
-
-       if (IS_LOCAL(user))
-       {
-               user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason.c_str());
-               if ((!user->sendq.empty()) && (!(*user->GetWriteError())))
-                       user->FlushWriteBuf();
-       }
-
-       if (user->registered == REG_ALL)
-       {
-               user->PurgeEmptyChannels();
-               user->WriteCommonExcept("QUIT :%s",reason.c_str());
-               FOREACH_MOD_I(Instance,I_OnUserQuit,OnUserQuit(user,reason));
-       }
-
-       FOREACH_MOD_I(Instance,I_OnUserDisconnect,OnUserDisconnect(user));
-
-       if (IS_LOCAL(user))
-       {
-               if (Instance->Config->GetIOHook(user->GetPort()))
-               {
-                       try
-                       {
-                               Instance->Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd);
-                       }
-                       catch (CoreException& modexcept)
-                       {
-                               Instance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                       }
-               }
-               
-               Instance->SE->DelFd(user);
-               user->CloseSocket();
-       }
-
-       /*
-        * 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))
-               {
-                       std::vector<userrec*>::iterator x = find(Instance->local_users.begin(),Instance->local_users.end(),user);
-                       if (x != Instance->local_users.end())
-                               Instance->local_users.erase(x);
-               }
-               Instance->clientlist->erase(iter);
-               DELETE(user);
-       }
+       Instance->GlobalCulls.AddItem(user, quitreason.c_str());
 }
 
-namespace irc
-{
-       namespace whowas
-       {
-
-               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);
-               }
-
-               WhoWasGroup::~WhoWasGroup()
-               {
-                       if (host)
-                               free(host);
-                       if (dhost)
-                               free(dhost);
-                       if (ident)
-                               free(ident);
-                       if (gecos)
-                               free(gecos);
-               }
-
-               /* 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())
+       command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+       if (whowas_command)
        {
-               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.push_back(std::make_pair(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.pop_front();
-               }
-       }
-       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);
+               std::deque<classbase*> params;
+               params.push_back(this);
+               whowas_command->HandleInternal(WHOWAS_ADD, params);
        }
 }
 
 /* add a client connection to the sockets list */
-void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, insp_inaddr ip)
+void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
 {
        std::string tempnick = ConvToStr(socket) + "-unknown";
        user_hash::iterator iter = Instance->clientlist->find(tempnick);
-       const char *ipaddr = insp_ntoa(ip);
+       char ipaddr[MAXBUF];
+#ifdef IPV6
+       if (socketfamily == AF_INET6)
+               inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr));
+       else
+               inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
+#else
+       inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
+#endif
        userrec* New;
        int j = 0;
 
@@ -1035,8 +846,6 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
                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;
@@ -1050,7 +859,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
        New->signon = Instance->Time() + Instance->Config->dns_timeout;
        New->lastping = 1;
 
-       New->SetSockAddr(AF_FAMILY, ipaddr, port);
+       New->SetSockAddr(socketfamily, ipaddr, port);
 
        /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
        for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
@@ -1147,7 +956,7 @@ unsigned long userrec::LocalCloneCount()
                return 0;
 }
 
-void userrec::FullConnect(CullList* Goners)
+void userrec::FullConnect()
 {
        ServerInstance->stats->statsConnects++;
        this->idle_lastmsg = ServerInstance->Time();
@@ -1156,25 +965,25 @@ void userrec::FullConnect(CullList* Goners)
 
        if ((!a) || (a->GetType() == CC_DENY))
        {
-               Goners->AddItem(this,"Unauthorised connection");
+               ServerInstance->GlobalCulls.AddItem(this,"Unauthorised connection");
                return;
        }
 
        if ((!a->GetPass().empty()) && (!this->haspassed))
        {
-               Goners->AddItem(this,"Invalid password");
+               ServerInstance->GlobalCulls.AddItem(this,"Invalid password");
                return;
        }
-       
+
        if (this->LocalCloneCount() > a->GetMaxLocal())
        {
-               Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)");
+               ServerInstance->GlobalCulls.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->GetMaxLocal(), this->GetIPString());
                return;
        }
        else if (this->GlobalCloneCount() > a->GetMaxGlobal())
        {
-               Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)");
+               ServerInstance->GlobalCulls.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->GetMaxGlobal(), this->GetIPString());
                return;
        }
@@ -1182,26 +991,26 @@ void userrec::FullConnect(CullList* Goners)
        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);
+                       ServerInstance->GlobalCulls.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);
+                       ServerInstance->GlobalCulls.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);
@@ -1281,7 +1090,7 @@ bool userrec::ForceNickChange(const char* newnick)
                int MOD_RESULT = 0;
 
                this->InvalidateCache();
-       
+
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
                if (MOD_RESULT)
@@ -1289,7 +1098,7 @@ bool userrec::ForceNickChange(const char* newnick)
                        ServerInstance->stats->statsCollisions++;
                        return false;
                }
-       
+
                if (ServerInstance->XLines->matches_qline(newnick))
                {
                        ServerInstance->stats->statsCollisions++;
@@ -1320,7 +1129,6 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
 #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;
@@ -1331,7 +1139,6 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
 #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;
@@ -1394,7 +1201,7 @@ const char* userrec::GetIPString()
                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) */
@@ -1435,7 +1242,7 @@ const char* userrec::GetIPString(char* buf)
                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) */
@@ -1476,6 +1283,11 @@ void userrec::Write(std::string text)
 
        try
        {
+               /* ServerInstance->Log(DEBUG,"<- %s", text.c_str());
+                * WARNING: The above debug line is VERY loud, do NOT
+                * enable it till we have a good way of filtering it
+                * out of the logs (e.g. 1.2 would be good).
+                */
                text.append("\r\n");
        }
        catch (...)
@@ -1546,7 +1358,7 @@ 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));
 }
 
@@ -1607,16 +1419,16 @@ void userrec::WriteCommon(const std::string &text)
        {
                bool sent_to_at_least_one = false;
                char tb[MAXBUF];
-       
+
                if (this->registered != REG_ALL)
                        return;
-       
+
                uniq_id++;
 
                /* We dont want to be doing this n times, just once */
                snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
                std::string out = tb;
-       
+
                for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
                {
                        CUList* ulist = v->first->GetUsers();
@@ -1630,14 +1442,14 @@ void userrec::WriteCommon(const std::string &text)
                                }
                        }
                }
-       
+
                /*
                 * 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(tb));
+                       this->Write(std::string(tb));
                }
        }
 
@@ -1775,16 +1587,16 @@ void userrec::WriteWallOps(const std::string &text)
 }
 
 void userrec::WriteWallOps(const char* text, ...)
-{       
+{
        char textbuffer[MAXBUF];
        va_list argsPtr;
 
        va_start(argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(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)
@@ -1829,6 +1641,7 @@ bool userrec::ChangeName(const char* gecos)
                FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
        }
        strlcpy(this->fullname,gecos,MAXGECOS+1);
+
        return true;
 }
 
@@ -1837,9 +1650,6 @@ bool userrec::ChangeDisplayedHost(const char* host)
        if (!strcmp(host, this->dhost))
                return true;
 
-       /* Invalidate cache */
-       this->InvalidateCache();
-
        if (IS_LOCAL(this))
        {
                int MOD_RESULT = 0;
@@ -1854,6 +1664,8 @@ bool userrec::ChangeDisplayedHost(const char* host)
        /* Fix by Om: userrec::dhost is 65 long, this was truncating some long hosts */
        strlcpy(this->dhost,host,64);
 
+       this->InvalidateCache();
+
        if (this->ServerInstance->Config->CycleHosts)
        {
                for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
@@ -1876,14 +1688,13 @@ bool userrec::ChangeIdent(const char* newident)
        if (!strcmp(newident, this->ident))
                return true;
 
-       /* Invalidate cache */
-       this->InvalidateCache();
-
        if (this->ServerInstance->Config->CycleHosts)
                this->WriteCommonExcept("%s","QUIT :Changing ident");
 
        strlcpy(this->ident, newident, IDENTMAX+2);
 
+       this->InvalidateCache();
+
        if (this->ServerInstance->Config->CycleHosts)
        {
                for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
@@ -1954,17 +1765,17 @@ void userrec::SplitChanList(userrec* dest, const std::string &cl)
                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));
@@ -1975,7 +1786,7 @@ void userrec::SplitChanList(userrec* dest, const std::string &cl)
                                line.append(cl.substr(start, length - start + 1));
                        }
                }
-       
+
                if (line.length())
                {
                        ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());