Don't apply bans to E:Lined connections. Should fix bug #896.

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 0324fad7f84c498729890b14265cff540303e7b6..2871653bb5e16f6d23b40282cf6b09eb01fb1be8 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -330,7 +330,7 @@ void User::CloseSocket()
        }
 }
 
-const std::string& User::GetFullHost()
+const std::string User::GetFullHost()
 {
        if (!this->cached_fullhost.empty())
                return this->cached_fullhost;
@@ -379,7 +379,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;
@@ -612,7 +612,7 @@ bool User::AddBuffer(const std::string &a)
        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;
        }
 
@@ -671,10 +671,7 @@ std::string User::GetBuffer()
 
 void User::AddWriteBuf(const std::string &data)
 {
-       if (this->quitting)
-               return;
-
-       if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && 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
@@ -682,10 +679,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
@@ -776,7 +776,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());
@@ -902,13 +902,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;
        }
 
@@ -1589,9 +1589,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);
 
@@ -1868,7 +1865,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
                        }
 
                        /* 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());
@@ -1964,6 +1961,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);
@@ -2044,6 +2045,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()
 {
 }