]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/users.cpp
Remove unneeded ProtocolInterface::Introduce
[user/henk/code/inspircd.git] / src / users.cpp
index 4f0476911ec8b3af0e6a3ba324c44441580b1a11..6087f4d1cd579f03739758fc4071eb2f18ad96c0 100644 (file)
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -90,6 +90,12 @@ std::string User::ProcessNoticeMasks(const char *sm)
                *c++;
        }
 
+       std::string s = this->FormatNoticeMasks();
+       if (s.length() == 0)
+       {
+               this->modes[UM_SNOMASK] = false;
+       }
+
        return output;
 }
 
@@ -101,11 +107,8 @@ void User::StartDNSLookup()
                const char* sip = this->GetIPString();
                UserResolver *res_reverse;
 
-               /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
-               if (!strncmp(sip, "0::ffff:", 8))
-                       res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
-               else
-                       res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+               QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
+               res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached);
 
                this->ServerInstance->AddResolver(res_reverse, cached);
        }
@@ -203,18 +206,18 @@ void User::DecrementModes()
 
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
-       server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-       reset_due = ServerInstance->Time();
+       server = Instance->FindServerNamePtr(Instance->Config->ServerName);
        age = ServerInstance->Time();
        Penalty = 0;
-       lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
+       lastping = signon = idle_lastmsg = nping = registered = 0;
        bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+       quietquit = quitting = exempt = haspassed = dns_done = false;
        fd = -1;
+       server_sa.sa.sa_family = AF_UNSPEC;
+       client_sa.sa.sa_family = AF_UNSPEC;
        recvq.clear();
        sendq.clear();
        Visibility = NULL;
-       ip = NULL;
        MyClass = NULL;
        AllowedPrivs = AllowedOperCommands = NULL;
        chans.clear();
@@ -241,6 +244,8 @@ User::~User()
        {
                this->MyClass->RefCount--;
                ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount);
+               if (MyClass->RefCount == 0)
+                       delete MyClass;
        }
 
        if (this->AllowedOperCommands)
@@ -258,22 +263,9 @@ User::~User()
        this->InvalidateCache();
        this->DecrementModes();
 
-       if (ip)
-       {
+       if (client_sa.sa.sa_family != AF_UNSPEC)
                ServerInstance->Users->RemoveCloneCounts(this);
 
-               if (this->GetProtocolFamily() == AF_INET)
-               {
-                       delete (sockaddr_in*)ip;
-               }
-#ifdef SUPPORT_IP6LINKS
-               else
-               {
-                       delete (sockaddr_in6*)ip;
-               }
-#endif
-       }
-
        ServerInstance->Users->uuidlist->erase(uuid);
 }
 
@@ -326,7 +318,7 @@ void User::CloseSocket()
        }
 }
 
-const std::string& User::GetFullHost()
+const std::string User::GetFullHost()
 {
        if (!this->cached_fullhost.empty())
                return this->cached_fullhost;
@@ -375,7 +367,7 @@ int User::ReadData(void* buffer, size_t size)
 }
 
 
-const std::string& User::GetFullRealHost()
+const std::string User::GetFullRealHost()
 {
        if (!this->cached_fullrealhost.empty())
                return this->cached_fullrealhost;
@@ -399,7 +391,7 @@ const std::string& User::GetFullRealHost()
 
 bool User::IsInvited(const irc::string &channel)
 {
-       time_t now = time(NULL);
+       time_t now = ServerInstance->Time();
        InvitedList::iterator safei;
        for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
        {
@@ -421,7 +413,7 @@ bool User::IsInvited(const irc::string &channel)
 
 InvitedList* User::GetInviteList()
 {
-       time_t now = time(NULL);
+       time_t now = ServerInstance->Time();
        /* Weed out expired invites here. */
        InvitedList::iterator safei;
        for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
@@ -439,7 +431,7 @@ InvitedList* User::GetInviteList()
 
 void User::InviteTo(const irc::string &channel, time_t invtimeout)
 {
-       time_t now = time(NULL);
+       time_t now = ServerInstance->Time();
        if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
        for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
        {
@@ -479,7 +471,7 @@ bool User::HasModePermission(unsigned char mode, ModeType type)
        if (mode < 'A' || mode > ('A' + 64)) return false;
 
        return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
-       
+
 }
 
 bool User::HasPermission(const std::string &command)
@@ -514,7 +506,6 @@ bool User::HasPermission(const std::string &command)
 
 bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 {
-       ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr);
        if (!IS_LOCAL(this))
        {
                ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
@@ -525,7 +516,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy)
        {
                if (noisy)
                        this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
-               ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)");
                return false;
        }
 
@@ -533,24 +523,20 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy)
        {
                if (noisy)
                        this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
-               ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)");
                return false;
        }
 
        if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
        {
-               ServerInstance->Logs->Log("PRIVS", DEBUG, "I do have it.");             
                return true;
        }
        else if (AllowedPrivs->find("*") != AllowedPrivs->end())
        {
-               ServerInstance->Logs->Log("PRIVS", DEBUG, "I allow all.");
                return true;
        }
 
        if (noisy)
                this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), this->oper.c_str(), privstr.c_str());
-       ServerInstance->Logs->Log("PRIVS", DEBUG, "I don't have it...");
        return false;
 }
 
@@ -608,10 +594,10 @@ bool User::AddBuffer(const std::string &a)
                }
        }
 
-       if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+       if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
        {
                ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
-               ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
+               ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
                return false;
        }
 
@@ -670,10 +656,7 @@ std::string User::GetBuffer()
 
 void User::AddWriteBuf(const std::string &data)
 {
-       if (this->quitting)
-               return;
-
-       if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+       if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
        {
                /*
                 * Fix by brain - Set the error text BEFORE calling, because
@@ -681,10 +664,13 @@ void User::AddWriteBuf(const std::string &data)
                 * to repeatedly add the text to the sendq!
                 */
                ServerInstance->Users->QuitUser(this, "SendQ exceeded");
-               ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax());
+               ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax());
                return;
        }
 
+       // We still want to append data to the sendq of a quitting user,
+       // e.g. their ERROR message that says 'closing link'
+
        if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
                sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
        else
@@ -757,6 +743,13 @@ void User::Oper(const std::string &opertype, const std::string &opername)
        this->oper.assign(opertype, 0, 512);
        ServerInstance->Users->all_opers.push_back(this);
 
+       /*
+        * This might look like it's in the wrong place.
+        * It is *not*!
+        *
+        * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type.
+        * -- w00t
+        */
        opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
        if (iter_opertype != ServerInstance->Config->opertypes.end())
        {
@@ -775,7 +768,7 @@ void User::Oper(const std::string &opertype, const std::string &opername)
                this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
                std::string myclass, mycmd, mypriv;
-               irc::spacesepstream Classes(iter_opertype->second);
+               irc::spacesepstream Classes(iter_opertype->second.c_str());
                while (Classes.GetToken(myclass))
                {
                        operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
@@ -835,6 +828,7 @@ void User::UnOper()
                 */
                this->oper.clear();
 
+
                /* Remove all oper only modes from the user when the deoper - Bug #466*/
                std::string moderemove("-");
 
@@ -845,12 +839,13 @@ void User::UnOper()
                                moderemove += letter;
                }
 
+
                std::vector<std::string> parameters;
                parameters.push_back(this->nick);
                parameters.push_back(moderemove);
 
                ServerInstance->Parser->CallHandler("MODE", parameters, this);
-                       
+
                /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
                ServerInstance->Users->all_opers.remove(this);
 
@@ -868,6 +863,7 @@ void User::UnOper()
 
                AllowedUserModes.reset();
                AllowedChanModes.reset();
+               this->modes[UM_OPERATOR] = 0;
        }
 }
 
@@ -890,7 +886,7 @@ void User::CheckClass()
 {
        ConnectClass* a = this->MyClass;
 
-       if ((!a) || (a->GetType() == CC_DENY))
+       if ((!a) || (a->type == CC_DENY))
        {
                ServerInstance->Users->QuitUser(this, "Unauthorised connection");
                return;
@@ -898,13 +894,13 @@ void User::CheckClass()
        else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
        {
                ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
-               ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
+               ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
                return;
        }
        else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
        {
                ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
-               ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+               ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
                return;
        }
 
@@ -914,7 +910,7 @@ void User::CheckClass()
 bool User::CheckLines(bool doZline)
 {
        const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
-       
+
        if (!this->exempt)
        {
                for (int n = 0; check[n]; ++n)
@@ -944,7 +940,7 @@ void User::FullConnect()
         * Don't remove this! -- w00t
         */
        this->SetClass();
-       
+
        /* Check the password, if one is required by the user's connect class.
         * This CANNOT be in CheckClass(), because that is called prior to PASS as well!
         */
@@ -989,11 +985,10 @@ void User::FullConnect()
 
        this->registered = REG_ALL;
 
-       ServerInstance->PI->Introduce(this);
-
        FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-       ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
+       ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]",
+               this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
        ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
        ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 }
@@ -1034,8 +1029,12 @@ bool User::ForceNickChange(const char* newnick)
 
        this->InvalidateCache();
 
+       this->Extend("NICKForced", "Enabled");
+
        FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
+       this->Shrink("NICKForced");
+
        if (MOD_RESULT)
        {
                ServerInstance->stats->statsCollisions++;
@@ -1049,7 +1048,9 @@ bool User::ForceNickChange(const char* newnick)
                std::vector<std::string> parameters;
                nickhandler->HandleInternal(1, dummy);
                parameters.push_back(newnick);
+               this->Extend("NICKForced", "Enabled");
                bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
+               this->Shrink("NICKForced");
                nickhandler->HandleInternal(0, dummy);
                return result;
        }
@@ -1058,81 +1059,22 @@ bool User::ForceNickChange(const char* newnick)
        return false;
 }
 
-void User::SetSockAddr(int protocol_family, const char* sip, int port)
+int User::GetServerPort()
 {
-       this->cachedip = "";
-
-       switch (protocol_family)
+       switch (this->server_sa.sa.sa_family)
        {
-#ifdef SUPPORT_IP6LINKS
                case AF_INET6:
-               {
-                       sockaddr_in6* sin = new sockaddr_in6;
-                       sin->sin6_family = AF_INET6;
-                       sin->sin6_port = port;
-                       inet_pton(AF_INET6, sip, &sin->sin6_addr);
-                       this->ip = (sockaddr*)sin;
-               }
-               break;
-#endif
-               case AF_INET:
-               {
-                       sockaddr_in* sin = new sockaddr_in;
-                       sin->sin_family = AF_INET;
-                       sin->sin_port = port;
-                       inet_pton(AF_INET, sip, &sin->sin_addr);
-                       this->ip = (sockaddr*)sin;
-               }
-               break;
-               default:
-                       ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
-               break;
-       }
-}
-
-int User::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
+                       return htons(this->server_sa.in6.sin6_port);
                case AF_INET:
-               {
-                       sockaddr_in* sin = (sockaddr_in*)this->ip;
-                       return sin->sin_port;
-               }
-               break;
-               default:
-               break;
+                       return htons(this->server_sa.in4.sin_port);
        }
        return 0;
 }
 
-int User::GetProtocolFamily()
-{
-       if (this->ip == NULL)
-               return 0;
-
-       sockaddr_in* sin = (sockaddr_in*)this->ip;
-       return sin->sin_family;
-}
-
 const char* User::GetCIDRMask(int range)
 {
        static char buf[44];
 
-       if (this->ip == NULL)
-               return "";
-
        if (range < 0)
                throw "Negative range, sorry, no.";
 
@@ -1140,50 +1082,45 @@ const char* User::GetCIDRMask(int range)
         * Original code written by Oliver Lupton (Om).
         * Integrated by me. Thanks. :) -- w00t
         */
-       switch (this->GetProtocolFamily())
+       switch (this->client_sa.sa.sa_family)
        {
-#ifdef SUPPORT_IP6LINKS
                case AF_INET6:
                {
                        /* unsigned char s6_addr[16]; */
                        struct in6_addr v6;
-                       sockaddr_in6* sin;
                        int i, bytestozero, extrabits;
                        char buffer[40];
-                       
+
                        if(range > 128)
                                throw "CIDR mask width greater than address width (IPv6, 128 bit)";
 
-                       /* Access the user's IP structure directly */
-                       sin = (sockaddr_in6*)this->ip;
-
                        /* To create the CIDR mask we want to set all the bits after 'range' bits of the address
                         * to zero. This means the last (128 - range) bits of the address must be set to zero.
                         * Hence this number divided by 8 is the number of whole bytes from the end of the address
                         * which must be set to zero.
                         */
                        bytestozero = (128 - range) / 8;
-                       
+
                        /* Some of the least significant bits of the next most significant byte may also have to
                         * be zeroed. The number of bits is the remainder of the above division.
                         */
                        extrabits = (128 - range) % 8;
-                       
+
                        /* Populate our working struct with the parts of the user's IP which are required in the
                         * final CIDR mask. Set all the subsequent bytes to zero.
                         * (16 - bytestozero) is the number of bytes which must be populated with actual IP data.
                         */
                        for(i = 0; i < (16 - bytestozero); i++)
                        {
-                               v6.s6_addr[i] = sin->sin6_addr.s6_addr[i];
+                               v6.s6_addr[i] = client_sa.in6.sin6_addr.s6_addr[i];
                        }
-                       
+
                        /* And zero all the remaining bytes in the IP. */
                        for(; i < 16; i++)
                        {
                                v6.s6_addr[i] = 0;
                        }
-                                       
+
                        /* And finally, zero the extra bits required. */
                        v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits;
 
@@ -1191,19 +1128,16 @@ const char* User::GetCIDRMask(int range)
                        return buf;
                }
                break;
-#endif
                case AF_INET:
                {
                        struct in_addr v4;
-                       sockaddr_in* sin;
                        char buffer[16];
 
                        if (range > 32)
                                throw "CIDR mask width greater than address width (IPv4, 32 bit)";
 
                        /* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */
-                       sin = (sockaddr_in*)this->ip;
-                       v4.s_addr = sin->sin_addr.s_addr;
+                       v4.s_addr = client_sa.in4.sin_addr.s_addr;
 
                        /* To create the CIDR mask we want to set all the bits after 'range' bits of the address
                         * to zero. This means the last (32 - range) bits of the address must be set to zero.
@@ -1233,53 +1167,32 @@ const char* User::GetCIDRMask(int range)
        return ""; // unused, but oh well
 }
 
-const char* User::GetIPString()
+std::string User::GetServerIP()
 {
-       static char buf[40];
-
-       if (this->ip == NULL)
-               return "";
-
-       if (!this->cachedip.empty())
-               return this->cachedip.c_str();
+       int port;
+       std::string ip;
+       irc::sockets::satoap(&server_sa, ip, port);
+       return ip;
+}
 
-       switch (this->GetProtocolFamily())
+const char* User::GetIPString()
+{
+       int port;
+       if (cachedip.empty())
        {
-#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';
-                               this->cachedip = temp;
-                               return temp;
-                       }
-                       
-                       this->cachedip = buf;
-                       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));
-                       this->cachedip = buf;
-                       return buf;
-               }
-               break;
-               default:
-               break;
+               irc::sockets::satoap(&client_sa, cachedip, port);
+               /* IP addresses starting with a : on irc are a Bad Thing (tm) */
+               if (cachedip.c_str()[0] == ':')
+                       cachedip.insert(0,1,'0');
        }
-       
-       // Unreachable, probably
-       return "";
+
+       return cachedip.c_str();
+}
+
+bool User::SetClientIP(const char* sip)
+{
+       this->cachedip = "";
+       return irc::sockets::aptosa(sip, 0, &client_sa);
 }
 
 /** NOTE: We cannot pass a const reference to this method.
@@ -1579,9 +1492,6 @@ void User::WriteCommonExcept(const std::string &text)
 
 void User::WriteWallOps(const std::string &text)
 {
-       if (!IS_LOCAL(this))
-               return;
-
        std::string wallop("WALLOPS :");
        wallop.append(text);
 
@@ -1825,10 +1735,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                {
                        ConnectClass* c = *i;
 
-                       if (c->GetDisabled())
-                               continue; // can't possibly match, removed from conf
-
-                       if (explicit_name == c->GetName())
+                       if (explicit_name == c->name)
                        {
                                ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
                                found = c;
@@ -1841,24 +1748,17 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                {
                        ConnectClass* c = *i;
 
-                       if (c->GetType() == CC_ALLOW)
+                       if (c->type == CC_ALLOW)
                        {
-                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str());
                        }
                        else
                        {
                                ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
                        }
 
-                       /* if it's disabled, we can't match this one. */
-                       if (c->GetDisabled())
-                       {
-                               ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
-                               continue;
-                       }
-
                        /* check if host matches.. */
-                       if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && 
+                       if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
                            !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
                        {
                                ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
@@ -1869,7 +1769,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                         * deny change if change will take class over the limit check it HERE, not after we found a matching class,
                         * because we should attempt to find another class if this one doesn't match us. -- w00t
                         */
-                       if (c->limit && (c->RefCount + 1 >= c->limit))
+                       if (c->limit && (c->RefCount >= c->limit))
                        {
                                ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
                                continue;
@@ -1881,9 +1781,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                                ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
 
                                /* and our port doesn't match, fail. */
-                               if (this->GetPort() != c->GetPort())
+                               if (this->GetServerPort() != c->GetPort())
                                {
-                                       ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+                                       ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort());
                                        continue;
                                }
                        }
@@ -1906,6 +1806,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                                return this->MyClass;
                        this->MyClass->RefCount--;
                        ServerInstance->Logs->Log("USERS", DEBUG, "Untying user from connect class -- refcount: %lu", this->MyClass->RefCount);
+                       if (MyClass->RefCount == 0)
+                               delete MyClass;
                }
 
                this->MyClass = found;
@@ -1954,6 +1856,10 @@ void User::PurgeEmptyChannels()
                chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
                if (i2 != ServerInstance->chanlist->end())
                {
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(i2->second));
+                       if (MOD_RESULT == 1)
+                               continue; // delete halted by module
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
                        delete i2->second;
                        ServerInstance->chanlist->erase(i2);
@@ -2034,6 +1940,26 @@ void User::DecreasePenalty(int decrease)
        this->Penalty -= decrease;
 }
 
+void FakeUser::SetFakeServer(std::string name)
+{
+       this->nick = name;
+       this->server = nick.c_str();
+}
+
+const std::string FakeUser::GetFullHost()
+{
+       if (*ServerInstance->Config->HideWhoisServer)
+               return ServerInstance->Config->HideWhoisServer;
+       return nick;
+}
+
+const std::string FakeUser::GetFullRealHost()
+{
+       if (*ServerInstance->Config->HideWhoisServer)
+               return ServerInstance->Config->HideWhoisServer;
+       return nick;
+}
+
 VisData::VisData()
 {
 }
@@ -2047,3 +1973,28 @@ bool VisData::VisibleTo(User* user)
        return true;
 }
 
+
+ConnectClass::ConnectClass(char t, const std::string& mask)
+       : type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
+{
+}
+
+ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
+       : type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
+{
+}
+
+void ConnectClass::Update(const ConnectClass* src)
+{
+       name = src->name;
+       registration_timeout = src->registration_timeout;
+       host = src->host;
+       pingtime = src->pingtime;
+       pass = src->pass;
+       hash = src->hash;
+       sendqmax = src->sendqmax;
+       recvqmax = src->recvqmax;
+       maxlocal = src->maxlocal;
+       maxglobal = src->maxglobal;
+       limit = src->limit;
+}