#include "bancache.h"
#include "commands/cmd_whowas.h"
-/* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 1;
+static unsigned long uniq_id = 1;
static unsigned long* already_sent = NULL;
User::User(const std::string &uid)
{
- server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
+ server = ServerInstance->Config->ServerName;
age = ServerInstance->Time();
Penalty = 0;
lastping = signon = idle_lastmsg = nping = registered = 0;
User::~User()
{
- ServerInstance->Logs->Log("USERS", DEBUG, "User destructor for %s", uuid.c_str());
- /* NULL for remote users :) */
- if (this->MyClass)
- {
- 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)
- {
- delete AllowedOperCommands;
- AllowedOperCommands = NULL;
- }
-
- if (this->AllowedPrivs)
- {
- delete AllowedPrivs;
- AllowedPrivs = NULL;
- }
-
- this->InvalidateCache();
- this->DecrementModes();
-
- if (client_sa.sa.sa_family != AF_UNSPEC)
- ServerInstance->Users->RemoveCloneCounts(this);
-
- ServerInstance->Users->uuidlist->erase(uuid);
+ if (uuid.length())
+ ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str());
}
const std::string& User::MakeHost()
if (quitting)
return;
- if (MyClass && !HasPrivPermission("users/flood/increased-buffers") && recvq.length() > MyClass->GetRecvqMax())
+ if (MyClass && recvq.length() > MyClass->GetRecvqMax() && !HasPrivPermission("users/flood/increased-buffers"))
{
ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",
nick.c_str(), (unsigned long)recvq.length(), MyClass->GetRecvqMax());
}
+ unsigned long sendqmax = ULONG_MAX;
+ if (MyClass && !HasPrivPermission("users/flood/increased-buffers"))
+ sendqmax = MyClass->GetSendqSoftMax();
- while (this->Penalty < 10)
+ while (Penalty < 10 && getSendQSize() < sendqmax)
{
std::string line;
line.reserve(MAXBUF);
ServerInstance->Parser->ProcessBuffer(line, this);
}
+ // Add pseudo-penalty so that we continue processing after sendq recedes
+ if (Penalty == 0 && getSendQSize() >= sendqmax)
+ Penalty++;
}
void User::AddWriteBuf(const std::string &data)
// Don't bother sending text to remote users!
if (IS_REMOTE(this))
return;
- if (!quitting && MyClass && getSendQSize() + data.length() > MyClass->GetSendqMax() && !HasPrivPermission("users/flood/increased-buffers"))
+ if (!quitting && MyClass && getSendQSize() + data.length() > MyClass->GetSendqHardMax() && !HasPrivPermission("users/flood/increased-buffers"))
{
/*
- * Fix by brain - Set the error text BEFORE calling, because
- * if we dont it'll recursively call here over and over again trying
- * to repeatedly add the text to the sendq!
+ * Quit the user FIRST, because otherwise we could recurse
+ * here and hit the same limit.
*/
ServerInstance->Users->QuitUser(this, "SendQ exceeded");
- ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ of %lu exceeds connect class maximum of %lu",
- nick.c_str(), (unsigned long)getSendQSize() + data.length(), MyClass->GetSendqMax());
+ ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu",
+ nick.c_str(), MyClass->GetSendqHardMax());
return;
}
ServerInstance->Users->QuitUser(this, getError());
}
-void User::cull()
+bool User::cull()
{
if (!quitting)
ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
+ if (uuid.empty())
+ {
+ ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty");
+ return true;
+ }
+ PurgeEmptyChannels();
if (IS_LOCAL(this))
{
if (fd != INT_MAX)
else
ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
}
+
+ if (this->AllowedOperCommands)
+ {
+ delete AllowedOperCommands;
+ AllowedOperCommands = NULL;
+ }
+
+ if (this->AllowedPrivs)
+ {
+ delete AllowedPrivs;
+ AllowedPrivs = NULL;
+ }
+
+ this->InvalidateCache();
+ this->DecrementModes();
+
+ if (client_sa.sa.sa_family != AF_UNSPEC)
+ ServerInstance->Users->RemoveCloneCounts(this);
+
+ ServerInstance->Users->uuidlist->erase(uuid);
+ uuid.clear();
+ return true;
}
void User::Oper(const std::string &opertype, const std::string &opername)
if (this->CheckLines())
return;
- this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
- this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str());
- this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName);
+ this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str());
+ this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str());
+ this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
- this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+ this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
ServerInstance->Config->Send005(this);
this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
return ""; // unused, but oh well
}
-std::string User::GetServerIP()
-{
- int port;
- std::string ip;
- irc::sockets::satoap(&server_sa, ip, port);
- return ip;
-}
-
const char* User::GetIPString()
{
int port;
void User::WriteServ(const std::string& text)
{
- this->Write(":%s %s",ServerInstance->Config->ServerName,text.c_str());
+ this->Write(":%s %s",ServerInstance->Config->ServerName.c_str(),text.c_str());
}
/** WriteServ()
if (MOD_RESULT == MOD_RES_DENY)
return;
- snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str());
+ snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName.c_str(), numeric, text.c_str());
this->Write(std::string(textbuffer));
}
dest->WriteFrom(this, data);
}
-
void User::WriteCommon(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
- if (this->registered != REG_ALL)
+ if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
return;
+ int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
+
va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
va_end(argsPtr);
- this->WriteCommon(std::string(textbuffer));
+ this->WriteCommonRaw(std::string(textbuffer), true);
}
-void User::WriteCommon(const std::string &text)
+void User::WriteCommonExcept(const char* text, ...)
{
- bool sent_to_at_least_one = false;
- char tb[MAXBUF];
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
- if (this->registered != REG_ALL)
+ if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
return;
- uniq_id++;
+ int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
+ va_end(argsPtr);
+
+ this->WriteCommonRaw(std::string(textbuffer), false);
+}
+
+void User::WriteCommonRaw(const std::string &line, bool include_self)
+{
+ if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ return;
if (!already_sent)
InitializeAlreadySent(ServerInstance->SE);
+ uniq_id++;
+
+ UserChanList include_c(chans);
+ std::map<User*,bool> exceptions;
+
+ exceptions[this] = include_self;
- /* We dont want to be doing this n times, just once */
- snprintf(tb,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
- std::string out = tb;
+ FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
- for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+ for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
{
- const UserMembList* ulist = (*v)->GetUsers();
+ User* u = i->first;
+ if (IS_LOCAL(u) && !u->quitting)
+ {
+ already_sent[u->fd] = uniq_id;
+ if (i->second)
+ u->Write(line);
+ }
+ }
+ for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+ {
+ Channel* c = *v;
+ const UserMembList* ulist = c->GetUsers();
for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
+ User* u = i->first;
+ if (IS_LOCAL(u) && !u->quitting && already_sent[u->fd] != uniq_id)
{
- already_sent[i->first->fd] = uniq_id;
- i->first->Write(out);
- sent_to_at_least_one = true;
+ already_sent[u->fd] = uniq_id;
+ u->Write(line);
}
}
}
-
- /*
- * 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->Write(std::string(tb));
- }
-}
-
-
-/* write a formatted string to all users who share at least one common
- * channel, NOT including the source user e.g. for use in QUIT
- */
-
-void User::WriteCommonExcept(const char* text, ...)
-{
- char textbuffer[MAXBUF];
- va_list argsPtr;
-
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- this->WriteCommonExcept(std::string(textbuffer));
}
void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
std::string out1 = tb1;
std::string out2 = tb2;
- for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+ UserChanList include_c(chans);
+ std::map<User*,bool> exceptions;
+
+ FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+
+ for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
{
- const UserMembList* ulist = (*v)->GetUsers();
- for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
+ User* u = i->first;
+ if (IS_LOCAL(u) && !u->quitting)
{
- if (this != i->first)
- {
- if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
- {
- already_sent[i->first->fd] = uniq_id;
- i->first->Write(IS_OPER(i->first) ? out2 : out1);
- }
- }
+ already_sent[u->fd] = uniq_id;
+ if (i->second)
+ u->Write(IS_OPER(u) ? out2 : out1);
}
}
-}
-
-void User::WriteCommonExcept(const std::string &text)
-{
- char tb1[MAXBUF];
- std::string out1;
-
- if (this->registered != REG_ALL)
- return;
-
- uniq_id++;
-
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
-
- snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
- out1 = tb1;
-
- for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+ for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
{
const UserMembList* ulist = (*v)->GetUsers();
for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (this != i->first)
+ User* u = i->first;
+ if (IS_LOCAL(u) && !u->quitting && (already_sent[u->fd] != uniq_id))
{
- if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
- {
- already_sent[i->first->fd] = uniq_id;
- i->first->Write(out1);
- }
+ already_sent[u->fd] = uniq_id;
+ u->Write(IS_OPER(u) ? out2 : out1);
}
}
}
-
}
void User::WriteWallOps(const std::string &text)
{
char buffer[MAXBUF];
- ModResult result = MOD_RES_PASSTHRU;
- FIRST_MOD_RESULT(OnHostCycle, result, (this));
-
- if (result == MOD_RES_DENY)
- return;
- if (result == MOD_RES_PASSTHRU && !ServerInstance->Config->CycleHosts)
+ if (!ServerInstance->Config->CycleHosts)
return;
uniq_id++;
if (!already_sent)
InitializeAlreadySent(ServerInstance->SE);
- for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+ UserChanList include_c(chans);
+ std::map<User*,bool> exceptions;
+
+ FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+
+ for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+ {
+ User* u = i->first;
+ if (IS_LOCAL(u) && !u->quitting)
+ {
+ already_sent[u->fd] = uniq_id;
+ if (i->second)
+ u->Write(quitline);
+ }
+ }
+ for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
{
Channel* c = *v;
snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
prefix << this->nick << " " << dest->nick << " :";
line = prefix.str();
- int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+ int namelen = ServerInstance->Config->ServerName.length() + 6;
for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
{
* 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 >= c->limit))
+ if (c->limit && (c->GetReferenceCount() >= c->limit))
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
continue;
*/
if (found)
{
- /* only fiddle with refcounts if they are already in a class .. */
- if (this->MyClass)
- {
- if (found == this->MyClass) // no point changing this shit :P
- 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;
- this->MyClass->RefCount++;
- ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %lu", this->MyClass->RefCount);
+ MyClass = found;
}
return this->MyClass;
this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
return;
}
- this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
+ this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.c_str());
for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
return;
}
- this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName);
+ this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
void FakeUser::SetFakeServer(std::string name)
{
this->nick = name;
- this->server = nick.c_str();
+ this->server = name;
}
const std::string FakeUser::GetFullHost()
{
- if (*ServerInstance->Config->HideWhoisServer)
+ if (!ServerInstance->Config->HideWhoisServer.empty())
return ServerInstance->Config->HideWhoisServer;
return nick;
}
const std::string FakeUser::GetFullRealHost()
{
- if (*ServerInstance->Config->HideWhoisServer)
+ if (!ServerInstance->Config->HideWhoisServer.empty())
return ServerInstance->Config->HideWhoisServer;
return nick;
}
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)
+ : type(t), name("unnamed"), registration_timeout(0), host(mask),
+ pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0),
+ recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
{
}
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)
+ : type(t), name("unnamed"),
+ registration_timeout(parent.registration_timeout), host(mask),
+ pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash),
+ softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax),
+ recvqmax(parent.recvqmax), maxlocal(parent.maxlocal),
+ maxglobal(parent.maxglobal), maxchans(parent.maxchans),
+ port(parent.port), limit(parent.limit)
{
}
pingtime = src->pingtime;
pass = src->pass;
hash = src->hash;
- sendqmax = src->sendqmax;
+ softsendqmax = src->softsendqmax;
+ hardsendqmax = src->hardsendqmax;
recvqmax = src->recvqmax;
maxlocal = src->maxlocal;
maxglobal = src->maxglobal;
projects / user / henk / code / inspircd.git / blobdiff