]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/usermanager.cpp
Relax fd bounds checking
[user/henk/code/inspircd.git] / src / usermanager.cpp
index 023e2aa5a674b520b6ac3ecdcb60fb2184c234e2..3c234f13f5c3ebee11f4e799fd7d6afdf742a06b 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
+#include "iohook.h"
+
+UserManager::UserManager()
+       : unregistered_count(0)
+{
+}
+
+UserManager::~UserManager()
+{
+       for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); ++i)
+       {
+               delete i->second;
+       }
+}
 
 /* add a client connection to the sockets list */
-void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
        /* NOTE: Calling this one parameter constructor for User automatically
         * allocates a new UUID and places it in the hash_map.
         */
-       User* New = NULL;
+       LocalUser* New = NULL;
        try
        {
-               New = new User();
+               New = new LocalUser(socket, client, server);
        }
        catch (...)
        {
-               ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
+               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
                ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
                return;
        }
+       UserIOHandler* eh = &New->eh;
 
-       New->SetFd(socket);
-       memcpy(&New->client_sa, client, sizeof(irc::sockets::sockaddrs));
-       memcpy(&New->server_sa, server, sizeof(irc::sockets::sockaddrs));
-
-       /* Give each of the modules an attempt to hook the user for I/O */
-       FOREACH_MOD(I_OnHookIO, OnHookIO(New, via));
+       // If this listener has an IO hook provider set then tell it about the connection
+       if (via->iohookprov)
+               via->iohookprov->OnAccept(eh, client, server);
 
-       if (New->GetIOHook())
-       {
-               try
-               {
-                       New->GetIOHook()->OnStreamSocketAccept(New, client, server);
-               }
-               catch (CoreException& modexcept)
-               {
-                       ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-               }
-       }
-
-       ServerInstance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
+       ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New user fd: %d", socket);
 
        this->unregistered_count++;
 
-       (*(this->clientlist))[New->uuid] = New;
-
        /* The users default nick is their UUID */
-       New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
-
-       New->server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
-       New->ident.assign("unknown");
+       New->nick = New->uuid;
+       this->clientlist[New->nick] = New;
 
        New->registered = REG_NONE;
        New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
        New->lastping = 1;
 
-       /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-       New->dhost.assign(New->GetIPString(), 0, 64);
-       New->host.assign(New->GetIPString(), 0, 64);
+       this->AddClone(New);
 
-       ServerInstance->Users->AddLocalClone(New);
-       ServerInstance->Users->AddGlobalClone(New);
+       this->local_users.push_front(New);
+
+       if (this->local_users.size() > ServerInstance->Config->SoftLimit)
+       {
+               ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
+               this->QuitUser(New,"No more connections allowed");
+               return;
+       }
 
        /*
         * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved.
         * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t
         */
-       ConnectClass* i = New->SetClass();
-
-       if (!i)
-       {
-               this->QuitUser(New, "Access denied by configuration");
-               return;
-       }
+       New->SetClass();
 
        /*
         * Check connect class settings and initialise settings into User.
         * This will be done again after DNS resolution. -- w00t
         */
-       New->CheckClass();
-
-       this->local_users.push_back(New);
-
-       if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
-       {
-               ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
-               this->QuitUser(New,"No more connections allowed");
+       New->CheckClass(ServerInstance->Config->CCOnConnect);
+       if (New->quitting)
                return;
-       }
 
        /*
         * even with bancache, we still have to keep User::exempt current.
@@ -116,15 +110,15 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
                if (!b->Type.empty() && !New->exempt)
                {
                        /* user banned */
-                       ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
-                       if (*ServerInstance->Config->MoronBanner)
-                               New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner);
+                       ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
+                       if (!ServerInstance->Config->XLineMessage.empty())
+                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }
                else
                {
-                       ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
+                       ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Negative hit for " + New->GetIPString());
                }
        }
        else
@@ -141,385 +135,208 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
                }
        }
 
-       if (!ServerInstance->SE->AddFd(New, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
+       if (!SocketEngine::AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
        {
-               ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
+               ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
                this->QuitUser(New, "Internal error handling connection");
        }
 
-       /* 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...");
+       if (ServerInstance->Config->RawLog)
+               New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
-       if (ServerInstance->Config->NoUserDns)
-       {
-               New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
-               New->dns_done = true;
-       }
-       else
-       {
-               New->StartDNSLookup();
-       }
+       FOREACH_MOD(OnSetUserIP, (New));
+       if (New->quitting)
+               return;
+
+       FOREACH_MOD(OnUserInit, (New));
 }
 
-void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
+void UserManager::QuitUser(User* user, const std::string& quitreason, const std::string* operreason)
 {
        if (user->quitting)
        {
-               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Tried to quit quitting user: " + user->nick);
                return;
        }
 
        if (IS_SERVER(user))
        {
-               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Tried to quit server user: " + user->nick);
                return;
        }
 
        user->quitting = true;
 
-       ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
-       user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+       ServerInstance->Logs->Log("USERS", LOG_DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
+       user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), operreason ? operreason->c_str() : quitreason.c_str());
 
        std::string reason;
-       std::string oper_reason;
        reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
-       if (operreason && *operreason)
-               oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit);
-       else
-               oper_reason = quitreason;
+       if (!operreason)
+               operreason = &reason;
 
        ServerInstance->GlobalCulls.AddItem(user);
 
        if (user->registered == REG_ALL)
        {
-               FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
-               user->WriteCommonQuit(reason, oper_reason);
+               FOREACH_MOD(OnUserQuit, (user, reason, *operreason));
+               user->WriteCommonQuit(reason, *operreason);
        }
-
-       FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
-
-       if (user->registered != REG_ALL)
-               if (ServerInstance->Users->unregistered_count)
-                       ServerInstance->Users->unregistered_count--;
+       else
+               unregistered_count--;
 
        if (IS_LOCAL(user))
        {
-               user->DoWrite();
-               if (user->GetIOHook())
-               {
-                       try
-                       {
-                               user->GetIOHook()->OnStreamSocketClose(user);
-                       }
-                       catch (CoreException& modexcept)
-                       {
-                               ServerInstance->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                       }
-               }
+               LocalUser* lu = IS_LOCAL(user);
+               FOREACH_MOD(OnUserDisconnect, (lu));
+               lu->eh.Close();
 
-               ServerInstance->SE->DelFd(user);
-               user->Close();
-               // user->Close() will set fd to -1; this breaks IS_LOCAL. Fix
-               user->SetFd(INT_MAX);
+               if (lu->registered == REG_ALL)
+                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operreason->c_str());
        }
 
-       /*
-        * 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))
-               {
-                       if (!user->quietquit)
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",
-                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
-                       }
-               }
-               else
-               {
-                       if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",
-                                       user->server, user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
-                       }
-               }
-               user->AddToWhoWas();
-       }
-
-       user_hash::iterator iter = this->clientlist->find(user->nick);
+       if (!clientlist.erase(user->nick))
+               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
-       if (iter != this->clientlist->end())
-               this->clientlist->erase(iter);
-       else
-               ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
-}
-
-
-void UserManager::AddLocalClone(User *user)
-{
-       int range = 32;
-       clonemap::iterator x;
-       switch (user->client_sa.sa.sa_family)
-       {
-               case AF_INET6:
-                       range = ServerInstance->Config->c_ipv6_range;
-               break;
-               case AF_INET:
-                       range = ServerInstance->Config->c_ipv4_range;
-               break;
-       }
-
-       x = local_clones.find(user->GetCIDRMask(range));
-       if (x != local_clones.end())
-               x->second++;
-       else
-               local_clones[user->GetCIDRMask(range)] = 1;
+       uuidlist.erase(user->uuid);
+       user->PurgeEmptyChannels();
 }
 
-void UserManager::AddGlobalClone(User *user)
+void UserManager::AddClone(User* user)
 {
-       int range = 32;
-       clonemap::iterator x;
-       switch (user->client_sa.sa.sa_family)
-       {
-               case AF_INET6:
-                       range = ServerInstance->Config->c_ipv6_range;
-               break;
-               case AF_INET:
-                       range = ServerInstance->Config->c_ipv4_range;
-               break;
-       }
-
-       x = global_clones.find(user->GetCIDRMask(range));
-       if (x != global_clones.end())
-               x->second++;
-       else
-               global_clones[user->GetCIDRMask(range)] = 1;
+       CloneCounts& counts = clonemap[user->GetCIDRMask()];
+       counts.global++;
+       if (IS_LOCAL(user))
+               counts.local++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-       int range = 32;
-       switch (user->client_sa.sa.sa_family)
+       CloneMap::iterator it = clonemap.find(user->GetCIDRMask());
+       if (it != clonemap.end())
        {
-               case AF_INET6:
-                       range = ServerInstance->Config->c_ipv6_range;
-               break;
-               case AF_INET:
-                       range = ServerInstance->Config->c_ipv4_range;
-               break;
-       }
-
-       clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
-       if (x != local_clones.end())
-       {
-               x->second--;
-               if (!x->second)
+               CloneCounts& counts = it->second;
+               counts.global--;
+               if (counts.global == 0)
                {
-                       local_clones.erase(x);
+                       // No more users from this IP, remove entry from the map
+                       clonemap.erase(it);
+                       return;
                }
-       }
 
-       clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
-       if (y != global_clones.end())
-       {
-               y->second--;
-               if (!y->second)
-               {
-                       global_clones.erase(y);
-               }
+               if (IS_LOCAL(user))
+                       counts.local--;
        }
 }
 
-unsigned long UserManager::GlobalCloneCount(User *user)
+const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
-       int range = 32;
-       switch (user->client_sa.sa.sa_family)
-       {
-               case AF_INET6:
-                       range = ServerInstance->Config->c_ipv6_range;
-               break;
-               case AF_INET:
-                       range = ServerInstance->Config->c_ipv4_range;
-               break;
-       }
-       clonemap::iterator x = global_clones.find(user->GetCIDRMask(range));
-       if (x != global_clones.end())
-               return x->second;
+       CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());
+       if (it != clonemap.end())
+               return it->second;
        else
-               return 0;
-}
-
-unsigned long UserManager::LocalCloneCount(User *user)
-{
-       int range = 32;
-       switch (user->client_sa.sa.sa_family)
-       {
-               case AF_INET6:
-                       range = ServerInstance->Config->c_ipv6_range;
-               break;
-               case AF_INET:
-                       range = ServerInstance->Config->c_ipv4_range;
-               break;
-       }
-       clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
-       if (x != local_clones.end())
-               return x->second;
-       else
-               return 0;
-}
-
-/* this function counts all users connected, wether they are registered or NOT. */
-unsigned int UserManager::UserCount()
-{
-       /*
-        * XXX: Todo:
-        *  As part of this restructuring, move clientlist/etc fields into usermanager.
-        *      -- w00t
-        */
-       return this->clientlist->size();
-}
-
-/* this counts only registered users, so that the percentages in /MAP don't mess up */
-unsigned int UserManager::RegisteredUserCount()
-{
-       return this->clientlist->size() - this->UnregisteredUserCount();
-}
-
-/* return how many users are opered */
-unsigned int UserManager::OperCount()
-{
-       return this->all_opers.size();
-}
-
-/* return how many users are unregistered */
-unsigned int UserManager::UnregisteredUserCount()
-{
-       return this->unregistered_count;
-}
-
-/* return how many local registered users there are */
-unsigned int UserManager::LocalUserCount()
-{
-       /* Doesnt count unregistered clients */
-       return (this->local_users.size() - this->UnregisteredUserCount());
+               return zeroclonecounts;
 }
 
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
-       if (!text)
-               return;
-
-       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 :%s", ServerInstance->Config->ServerName, textbuffer);
+       std::string message;
+       VAFORMAT(message, text, text);
+       message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + message;
 
-       for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                User* t = *i;
-               t->WriteServ(std::string(formatbuffer));
+               t->WriteServ(message);
        }
 }
 
-void UserManager::ServerPrivmsgAll(const char* text, ...)
+void UserManager::GarbageCollect()
 {
-       if (!text)
-               return;
-
-       char textbuffer[MAXBUF];
-       char formatbuffer[MAXBUF];
-       va_list argsPtr;
-       va_start (argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer);
-
-       for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       // Reset the already_sent IDs so we don't wrap it around and drop a message
+       LocalUser::already_sent_id = 0;
+       for (LocalUserList::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
-               User* t = *i;
-               t->WriteServ(std::string(formatbuffer));
+               (**i).already_sent = 0;
+               (**i).RemoveExpiredInvites();
        }
 }
 
-void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
+/* this returns true when all modules are satisfied that the user should be allowed onto the irc server
+ * (until this returns true, a user will block in the waiting state, waiting to connect up to the
+ * registration timeout maximum seconds)
+ */
+bool UserManager::AllModulesReportReady(LocalUser* user)
 {
-       char textbuffer[MAXBUF];
-       int modelen;
-       va_list argsPtr;
+       ModResult res;
+       FIRST_MOD_RESULT(OnCheckReady, res, (user));
+       return (res == MOD_RES_PASSTHRU);
+}
 
-       if (!text || !modes || !flags)
+/**
+ * This function is called once a second from the mainloop.
+ * It is intended to do background checking on all the user structs, e.g.
+ * stuff like ping checks, registration timeouts, etc.
+ */
+void UserManager::DoBackgroundUserStuff()
+{
+       /*
+        * loop over all local users..
+        */
+       for (LocalUserList::iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
-               ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
-               return;
-       }
+               LocalUser* curr = *i;
 
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-       modelen = strlen(modes);
+               if (curr->quitting)
+                       continue;
 
-       if (flags == WM_AND)
-       {
-               for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+               if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
                {
-                       User* t = *i;
-                       bool send_to_user = true;
+                       unsigned int rate = curr->MyClass->GetCommandRate();
+                       if (curr->CommandFloodPenalty > rate)
+                               curr->CommandFloodPenalty -= rate;
+                       else
+                               curr->CommandFloodPenalty = 0;
+                       curr->eh.OnDataReady();
+               }
 
-                       for (int n = 0; n < modelen; n++)
-                       {
-                               if (!t->IsModeSet(modes[n]))
+               switch (curr->registered)
+               {
+                       case REG_ALL:
+                               if (ServerInstance->Time() > curr->nping)
                                {
-                                       send_to_user = false;
-                                       break;
+                                       // This user didn't answer the last ping, remove them
+                                       if (!curr->lastping)
+                                       {
+                                               time_t time = ServerInstance->Time() - (curr->nping - curr->MyClass->GetPingTime());
+                                               const std::string message = "Ping timeout: " + ConvToStr(time) + (time != 1 ? " seconds" : " second");
+                                               this->QuitUser(curr, message);
+                                               continue;
+                                       }
+
+                                       curr->Write("PING :" + ServerInstance->Config->ServerName);
+                                       curr->lastping = 0;
+                                       curr->nping = ServerInstance->Time() + curr->MyClass->GetPingTime();
                                }
-                       }
-                       if (send_to_user)
-                       {
-                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
-                       }
-               }
-       }
-       else if (flags == WM_OR)
-       {
-               for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-               {
-                       User* t = *i;
-                       bool send_to_user = false;
-
-                       for (int n = 0; n < modelen; n++)
-                       {
-                               if (t->IsModeSet(modes[n]))
+                               break;
+                       case REG_NICKUSER:
+                               if (AllModulesReportReady(curr))
                                {
-                                       send_to_user = true;
-                                       break;
+                                       /* User has sent NICK/USER, modules are okay, DNS finished. */
+                                       curr->FullConnect();
+                                       continue;
                                }
-                       }
+                               break;
+               }
 
-                       if (send_to_user)
-                       {
-                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
-                       }
+               if (curr->registered != REG_ALL && (ServerInstance->Time() > (curr->age + curr->MyClass->GetRegTimeout())))
+               {
+                       /*
+                        * registration timeout -- didnt send USER/NICK/HOST
+                        * in the time specified in their connection class.
+                        */
+                       this->QuitUser(curr, "Registration timeout");
+                       continue;
                }
        }
 }
-
-/* return how many users have a given mode e.g. 'a' */
-int UserManager::ModeCount(const char mode)
-{
-       ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_USER);
-
-       if (mh)
-               return mh->GetCount();
-       else
-               return 0;
-}