Pull in bancache.h from inspircd.h

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

diff --git a/src/users.cpp b/src/users.cpp
index a52c392fc74e219aa552c7266ed44e0bb2106c58..7fba57faa8b59b5825ea6dc40398c4633f1dedd3 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -27,7 +27,6 @@
 #include <stdarg.h>
 #include "socketengine.h"
 #include "xline.h"
-#include "bancache.h"
 
 already_sent_t LocalUser::already_sent_id = 0;
 
@@ -285,7 +284,7 @@ eol_found:
                recvq = recvq.substr(qpos);
 
                // TODO should this be moved to when it was inserted in recvq?
-               ServerInstance->stats->statsRecv += qpos;
+               ServerInstance->stats.Recv += qpos;
                user->bytes_in += qpos;
                user->cmds_in++;
 
@@ -540,7 +539,7 @@ bool LocalUser::CheckLines(bool doZline)
 
 void LocalUser::FullConnect()
 {
-       ServerInstance->stats->statsConnects++;
+       ServerInstance->stats.Connects++;
        this->idle_lastmsg = ServerInstance->Time();
 
        /*
@@ -558,11 +557,11 @@ void LocalUser::FullConnect()
                return;
 
        this->WriteNumeric(RPL_WELCOME, ":Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
-       this->WriteNumeric(RPL_YOURHOSTIS, ":Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), BRANCH);
+       this->WriteNumeric(RPL_YOURHOSTIS, ":Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH);
        this->WriteNumeric(RPL_SERVERCREATED, ":This server was created %s %s", __TIME__, __DATE__);
 
        const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
-       this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str());
+       this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH, modelist.c_str());
 
        ServerInstance->ISupport.SendTo(this);
 
@@ -629,7 +628,7 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
 
                if (MOD_RESULT == MOD_RES_DENY)
                {
-                       ServerInstance->stats->statsCollisions++;
+                       ServerInstance->stats.Collisions++;
                        return false;
                }
        }
@@ -695,7 +694,7 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
                        if (InUse->registered != REG_ALL)
                        {
                                /* force the camper to their UUID, and ask them to re-send a NICK. */
-                               InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str());
+                               InUse->WriteFrom(InUse, "NICK %s", InUse->uuid.c_str());
                                InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str());
 
                                ServerInstance->Users->clientlist.erase(InUse->nick);
@@ -837,7 +836,7 @@ void LocalUser::Write(const std::string& text)
        eh.AddWriteBuf(text);
        eh.AddWriteBuf(wide_newline);
 
-       ServerInstance->stats->statsSent += text.length() + 2;
+       ServerInstance->stats.Sent += text.length() + 2;
        this->bytes_out += text.length() + 2;
        this->cmds_out++;
 }
@@ -908,21 +907,6 @@ void User::WriteFrom(User *user, const char* text, ...)
        this->WriteFrom(user, textbuffer);
 }
 
-
-/* write text to an destination user from a source user (e.g. user privmsg) */
-
-void User::WriteTo(User *dest, const char *data, ...)
-{
-       std::string textbuffer;
-       VAFORMAT(textbuffer, data, data);
-       this->WriteTo(dest, textbuffer);
-}
-
-void User::WriteTo(User *dest, const std::string &data)
-{
-       dest->WriteFrom(this, data);
-}
-
 void User::WriteCommon(const char* text, ...)
 {
        if (this->registered != REG_ALL || quitting)
@@ -934,17 +918,6 @@ void User::WriteCommon(const char* text, ...)
        this->WriteCommonRaw(textbuffer, true);
 }
 
-void User::WriteCommonExcept(const char* text, ...)
-{
-       if (this->registered != REG_ALL || quitting)
-               return;
-
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
-       this->WriteCommonRaw(textbuffer, false);
-}
-
 void User::WriteCommonRaw(const std::string &line, bool include_self)
 {
        if (this->registered != REG_ALL || quitting)
@@ -1144,19 +1117,6 @@ bool User::ChangeIdent(const std::string& newident)
        return true;
 }
 
-void User::SendAll(const char* command, const char* text, ...)
-{
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       const std::string message = ":" + this->GetFullHost() + " " + command + " $* :" + textbuffer;
-
-       for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
-       {
-               if ((*i)->registered == REG_ALL)
-                       (*i)->Write(message);
-       }
-}
-
 /*
  * Sets a user's connection class.
  * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc.
@@ -1291,7 +1251,7 @@ const std::string& FakeUser::GetFullRealHost()
 ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
        : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
        pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0),
-       penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0),
+       penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(ServerInstance->Config->MaxChans),
        limit(0), resolvehostnames(true)
 {
 }