* ---------------------------------------------------
*/
-/* $Core */
-
#include "inspircd.h"
#include <stdarg.h>
#include "socketengine.h"
#include "bancache.h"
#include "commands/cmd_whowas.h"
-static unsigned long uniq_id = 1;
-
-static unsigned long* already_sent = NULL;
-
-LocalIntExt User::NICKForced("NICKForced", NULL);
-LocalStringExt User::OperQuit("OperQuit", NULL);
-
-void InitializeAlreadySent(SocketEngine* SE)
+typedef unsigned int uniq_id_t;
+class sent
{
- already_sent = new unsigned long[SE->GetMaxFds()];
- memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
-}
+ uniq_id_t uniq_id;
+ uniq_id_t* array;
+ void init()
+ {
+ if (!array)
+ array = new uniq_id_t[ServerInstance->SE->GetMaxFds()];
+ memset(array, 0, ServerInstance->SE->GetMaxFds() * sizeof(uniq_id_t));
+ uniq_id++;
+ }
+ public:
+ sent() : uniq_id(static_cast<uniq_id_t>(-1)), array(NULL) {}
+ inline uniq_id_t operator++()
+ {
+ if (++uniq_id == 0)
+ init();
+ return uniq_id;
+ }
+ inline uniq_id_t& operator[](int i)
+ {
+ return array[i];
+ }
+ ~sent()
+ {
+ delete[] array;
+ }
+};
+
+static sent already_sent;
std::string User::ProcessNoticeMasks(const char *sm)
{
Penalty = 0;
lastping = signon = idle_lastmsg = nping = registered = 0;
bytes_in = bytes_out = cmds_in = cmds_out = 0;
- quietquit = quitting = exempt = haspassed = dns_done = false;
+ quietquit = quitting = exempt = dns_done = false;
fd = -1;
server_sa.sa.sa_family = AF_UNSPEC;
client_sa.sa.sa_family = AF_UNSPEC;
- MyClass = NULL;
AllowedPrivs = AllowedOperCommands = NULL;
if (uid.empty())
- uuid.assign(ServerInstance->GetUID(), 0, UUID_LENGTH - 1);
+ uuid = ServerInstance->GetUID();
else
- uuid.assign(uid, 0, UUID_LENGTH - 1);
+ uuid = uid;
ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), uid.empty() ? "allocated new" : "used remote");
unsigned long sendqmax = ULONG_MAX;
if (MyClass && !HasPrivPermission("users/flood/increased-buffers"))
sendqmax = MyClass->GetSendqSoftMax();
+ int penaltymax = MyClass->GetPenaltyThreshold();
+ if (penaltymax == 0 || HasPrivPermission("users/flood/no-fakelag"))
+ penaltymax = INT_MAX;
- while (Penalty < 10 && getSendQSize() < sendqmax)
+ while (Penalty < penaltymax && getSendQSize() < sendqmax)
{
std::string line;
line.reserve(MAXBUF);
this->cmds_in++;
ServerInstance->Parser->ProcessBuffer(line, this);
+ if (quitting)
+ return;
}
// Add pseudo-penalty so that we continue processing after sendq recedes
if (Penalty == 0 && getSendQSize() >= sendqmax)
ServerInstance->Users->QuitUser(this, getError());
}
-bool User::cull()
+CullResult 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;
+ return Extensible::cull();
}
PurgeEmptyChannels();
if (IS_LOCAL(this))
ServerInstance->Users->uuidlist->erase(uuid);
uuid.clear();
- return true;
+ return Extensible::cull();
}
void User::Oper(const std::string &opertype, const std::string &opername)
* 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());
+ TagIndex::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
if (iter_opertype != ServerInstance->Config->opertypes.end())
{
if (AllowedOperCommands)
this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
std::string myclass, mycmd, mypriv;
- irc::spacesepstream Classes(iter_opertype->second.c_str());
+ irc::spacesepstream Classes(iter_opertype->second->getString("classes"));
while (Classes.GetToken(myclass))
{
- operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
+ TagIndex::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
if (iter_operclass != ServerInstance->Config->operclass.end())
{
/* Process commands */
- irc::spacesepstream CommandList(iter_operclass->second.commandlist);
+ irc::spacesepstream CommandList(iter_operclass->second->getString("commands"));
while (CommandList.GetToken(mycmd))
{
this->AllowedOperCommands->insert(mycmd);
}
- irc::spacesepstream PrivList(iter_operclass->second.privs);
+ irc::spacesepstream PrivList(iter_operclass->second->getString("privs"));
while (PrivList.GetToken(mypriv))
{
this->AllowedPrivs->insert(mypriv);
}
- for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist.c_str(); *c; ++c)
+ for (unsigned char* c = (unsigned char*)iter_operclass->second->getString("usermodes").c_str(); *c; ++c)
{
if (*c == '*')
{
}
}
- for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist.c_str(); *c; ++c)
+ for (unsigned char* c = (unsigned char*)iter_operclass->second->getString("chanmodes").c_str(); *c; ++c)
{
if (*c == '*')
{
/* 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!
*/
- if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
+ if (MyClass && !MyClass->pass.empty())
{
- ServerInstance->Users->QuitUser(this, "Invalid password");
- return;
+ if (ServerInstance->PassCompare(this, MyClass->pass.c_str(), password.c_str(), MyClass->hash.c_str()))
+ {
+ ServerInstance->Users->QuitUser(this, "Invalid password");
+ return;
+ }
}
if (this->CheckLines())
this->InvalidateCache();
- NICKForced.set(this, 1);
+ ServerInstance->NICKForced.set(this, 1);
FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
- NICKForced.set(this, 0);
+ ServerInstance->NICKForced.set(this, 0);
if (MOD_RESULT == MOD_RES_DENY)
{
{
std::vector<std::string> parameters;
parameters.push_back(newnick);
- NICKForced.set(this, 1);
+ ServerInstance->NICKForced.set(this, 1);
bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
- NICKForced.set(this, 0);
+ ServerInstance->NICKForced.set(this, 0);
return result;
}
char textbuffer[MAXBUF];
va_list argsPtr;
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
char textbuffer[MAXBUF];
va_list argsPtr;
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
void User::WriteCommonRaw(const std::string &line, bool include_self)
{
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
- uniq_id++;
+ uniq_id_t uniq_id = ++already_sent;
UserChanList include_c(chans);
std::map<User*,bool> exceptions;
if (this->registered != REG_ALL)
return;
- uniq_id++;
-
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
+ uniq_id_t uniq_id = ++already_sent;
snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),normal_text.c_str());
snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),oper_text.c_str());
}
}
-void User::WriteWallOps(const std::string &text)
+void User::SendText(const std::string& line)
{
- std::string wallop("WALLOPS :");
- wallop.append(text);
-
- for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
- {
- User* t = *i;
- if (t->IsModeSet('w'))
- this->WriteTo(t,wallop);
- }
+ if (IS_LOCAL(this))
+ Write(line);
+ else if (!IS_SERVER(this))
+ ServerInstance->PI->PushToClient(this, line);
}
-void User::WriteWallOps(const char* text, ...)
+void User::SendText(const char *text, ...)
{
- if (!IS_LOCAL(this))
- return;
-
- char textbuffer[MAXBUF];
va_list argsPtr;
+ char line[MAXBUF];
va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ vsnprintf(line, MAXBUF, text, argsPtr);
va_end(argsPtr);
- this->WriteWallOps(std::string(textbuffer));
+ SendText(std::string(line));
+}
+
+void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
+{
+ char line[MAXBUF];
+ int start_pos = LinePrefix.length();
+ int pos = start_pos;
+ memcpy(line, LinePrefix.data(), pos);
+ std::string Word;
+ while (TextStream >> Word)
+ {
+ int len = Word.length();
+ if (pos + len + 12 > MAXBUF)
+ {
+ line[pos] = '\0';
+ SendText(std::string(line));
+ pos = start_pos;
+ }
+ line[pos] = ' ';
+ memcpy(line + pos + 1, Word.data(), len);
+ pos += len + 1;
+ }
+ line[pos] = '\0';
+ SendText(std::string(line));
}
/* return 0 or 1 depending if users u and u2 share one or more common channels
if (!ServerInstance->Config->CycleHosts)
return;
- uniq_id++;
-
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
+ uniq_id_t silent_id = ++already_sent;
+ uniq_id_t seen_id = ++already_sent;
UserChanList include_c(chans);
std::map<User*,bool> exceptions;
User* u = i->first;
if (IS_LOCAL(u) && !u->quitting)
{
- already_sent[u->fd] = uniq_id;
if (i->second)
+ {
+ already_sent[u->fd] = seen_id;
u->Write(quitline);
+ }
+ else
+ {
+ already_sent[u->fd] = silent_id;
+ }
}
}
for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
User* u = i->first;
if (u == this || !IS_LOCAL(u))
continue;
+ if (already_sent[u->fd] == silent_id)
+ continue;
- if (already_sent[i->first->fd] != uniq_id)
+ if (already_sent[u->fd] != seen_id)
{
u->Write(quitline);
- already_sent[i->first->fd] = uniq_id;
+ already_sent[i->first->fd] = seen_id;
}
u->Write(joinline);
if (modeline.length() > 0)
void User::PurgeEmptyChannels()
{
- std::vector<Channel*> to_delete;
-
// firstly decrement the count on each channel
for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
{
Channel* c = *f;
- c->RemoveAllPrefixes(this);
- if (c->DelUser(this) == 0)
- {
- /* No users left in here, mark it for deletion */
- try
- {
- to_delete.push_back(c);
- }
- catch (...)
- {
- ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
- }
- }
- }
-
- for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
- {
- Channel* thischan = *n;
- chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
- if (i2 != ServerInstance->chanlist->end())
- {
- ModResult MOD_RESULT;
- FIRST_MOD_RESULT(OnChannelPreDelete, MOD_RESULT, (i2->second));
- if (MOD_RESULT == MOD_RES_DENY)
- continue; // delete halted by module
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
- delete i2->second;
- ServerInstance->chanlist->erase(i2);
- this->chans.erase(*n);
- }
+ c->DelUser(this);
}
this->UnOper();
this->Penalty += increase;
}
-void User::DecreasePenalty(int decrease)
-{
- this->Penalty -= decrease;
-}
-
void FakeUser::SetFakeServer(std::string name)
{
this->nick = name;
return nick;
}
-ConnectClass::ConnectClass(char t, const std::string& mask)
- : type(t), name("unnamed"), registration_timeout(0), host(mask),
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
+ : config(tag), 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)
+ recvqmax(0), penaltythreshold(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"),
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent)
+ : config(tag), 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),
+ recvqmax(parent.recvqmax), penaltythreshold(parent.penaltythreshold), maxlocal(parent.maxlocal),
maxglobal(parent.maxglobal), maxchans(parent.maxchans),
port(parent.port), limit(parent.limit)
{
softsendqmax = src->softsendqmax;
hardsendqmax = src->hardsendqmax;
recvqmax = src->recvqmax;
+ penaltythreshold = src->penaltythreshold;
maxlocal = src->maxlocal;
maxglobal = src->maxglobal;
limit = src->limit;
projects / user / henk / code / inspircd.git / blobdiff