static unsigned long* already_sent = NULL;
+LocalIntExt User::NICKForced("NICKForced", NULL);
+LocalStringExt User::OperQuit("OperQuit", NULL);
void InitializeAlreadySent(SocketEngine* SE)
{
memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
}
-
std::string User::ProcessNoticeMasks(const char *sm)
{
bool adding = true, oldadding = false;
UserResolver *res_reverse;
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);
+ res_reverse = new UserResolver(this, sip, resolvtype, cached);
- this->ServerInstance->AddResolver(res_reverse, cached);
+ ServerInstance->AddResolver(res_reverse, cached);
}
catch (CoreException& e)
{
}
}
-User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
+User::User(const std::string &uid)
{
- server = Instance->FindServerNamePtr(Instance->Config->ServerName);
+ server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
age = ServerInstance->Time();
Penalty = 0;
lastping = signon = idle_lastmsg = nping = registered = 0;
fd = -1;
server_sa.sa.sa_family = AF_UNSPEC;
client_sa.sa.sa_family = AF_UNSPEC;
- recvq.clear();
- sendq.clear();
- Visibility = NULL;
MyClass = NULL;
AllowedPrivs = AllowedOperCommands = NULL;
- chans.clear();
- invites.clear();
if (uid.empty())
- uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
+ uuid.assign(ServerInstance->GetUID(), 0, UUID_LENGTH - 1);
else
uuid.assign(uid, 0, UUID_LENGTH - 1);
ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), uid.empty() ? "allocated new" : "used remote");
- user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
- if (finduuid == Instance->Users->uuidlist->end())
- (*Instance->Users->uuidlist)[uuid] = this;
+ user_hash::iterator finduuid = ServerInstance->Users->uuidlist->find(uuid);
+ if (finduuid == ServerInstance->Users->uuidlist->end())
+ (*ServerInstance->Users->uuidlist)[uuid] = this;
else
throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
}
User::~User()
{
+ ServerInstance->Logs->Log("USERS", DEBUG, "User destructor for %s", uuid.c_str());
/* NULL for remote users :) */
if (this->MyClass)
{
return this->cached_hostip;
}
-void User::CloseSocket()
-{
- if (this->fd > -1)
- {
- ServerInstance->SE->Shutdown(this, 2);
- ServerInstance->SE->Close(this);
- }
-}
-
const std::string User::GetFullHost()
{
if (!this->cached_fullhost.empty())
return nresult;
}
-int User::ReadData(void* buffer, size_t size)
-{
- if (IS_LOCAL(this))
- {
-#ifndef WIN32
- return read(this->fd, buffer, size);
-#else
- return recv(this->fd, (char*)buffer, size, 0);
-#endif
- }
- else
- return 0;
-}
-
-
const std::string User::GetFullRealHost()
{
if (!this->cached_fullrealhost.empty())
return false;
}
-bool User::AddBuffer(const std::string &a)
+void User::OnDataReady()
{
- std::string::size_type start = 0;
- std::string::size_type i = a.find('\r');
-
- /*
- * The old implementation here took a copy, and rfind() on \r, removing as it found them, before
- * copying a second time onto the recvq. That's ok, but involves three copies minimum (recv() to buffer,
- * buffer to here, here to recvq) - The new method now copies twice (recv() to buffer, buffer to recvq).
- *
- * We use find() instead of rfind() for clarity, however unlike the old code, our scanning of the string is
- * contiguous: as we specify a startpoint, we never see characters we have scanned previously, making this
- * marginally faster in cases with a number of \r hidden early on in the buffer.
- *
- * How it works:
- * Start at first pos of string, find first \r, append everything in the chunk (excluding \r) to recvq. Set
- * i ahead of the \r, search for next \r, add next chunk to buffer... repeat.
- * -- w00t (7 may, 2008)
- */
- if (i == std::string::npos)
- {
- // no \r that we need to dance around, just add to buffer
- recvq.append(a);
- }
- else
- {
- // While we can find the end of a chunk to add
- while (i != std::string::npos)
- {
- // Append the chunk that we have
- recvq.append(a, start, (i - start));
-
- // Start looking for the next one
- start = i + 1;
- i = a.find('\r', start);
- }
-
- if (start != a.length())
- {
- /*
- * This is here to catch a corner case when we get something like:
- * NICK w0
- * 0t\r\nU
- * SER ...
- * in successive calls to us.
- *
- * Without this conditional, the 'U' on the second case will be dropped,
- * which is most *certainly* not the behaviour we want!
- * -- w00t
- */
- recvq.append(a, start, (a.length() - start));
- }
- }
+ if (quitting)
+ return;
- if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
+ if (MyClass && !HasPrivPermission("users/flood/increased-buffers") && recvq.length() > 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());
- return false;
+ ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",
+ nick.c_str(), (unsigned long)recvq.length(), MyClass->GetRecvqMax());
}
- return true;
-}
-
-bool User::BufferIsReady()
-{
- return (recvq.find('\n') != std::string::npos);
-}
-
-void User::ClearBuffer()
-{
- recvq.clear();
-}
-
-std::string User::GetBuffer()
-{
- try
+ while (this->Penalty < 10)
{
- if (recvq.empty())
- return "";
-
- /* Strip any leading \r or \n off the string.
- * Usually there are only one or two of these,
- * so its is computationally cheap to do.
- */
- std::string::iterator t = recvq.begin();
- while (t != recvq.end() && (*t == '\r' || *t == '\n'))
- {
- recvq.erase(t);
- t = recvq.begin();
- }
-
- for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+ std::string line;
+ line.reserve(MAXBUF);
+ std::string::size_type qpos = 0;
+ while (qpos < recvq.length())
{
- /* Find the first complete line, return it as the
- * result, and leave the recvq as whats left
- */
- if (*x == '\n')
+ char c = recvq[qpos++];
+ switch (c)
{
- std::string ret = std::string(recvq.begin(), x);
- recvq.erase(recvq.begin(), x + 1);
- return ret;
+ case '\0':
+ c = ' ';
+ break;
+ case '\r':
+ continue;
+ case '\n':
+ goto eol_found;
}
+ if (line.length() < MAXBUF - 2)
+ line.push_back(c);
}
- return "";
- }
+ // if we got here, the recvq ran out before we found a newline
+ return;
+eol_found:
+ // just found a newline. Terminate the string, and pull it out of recvq
+ recvq = recvq.substr(qpos);
- catch (...)
- {
- ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
- return "";
+ // TODO should this be moved to when it was inserted in recvq?
+ ServerInstance->stats->statsRecv += qpos;
+ this->bytes_in += qpos;
+ this->cmds_in++;
+
+ ServerInstance->Parser->ProcessBuffer(line, this);
}
}
void User::AddWriteBuf(const std::string &data)
{
- if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
+ // 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"))
{
/*
* Fix by brain - Set the error text BEFORE calling, because
* 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",
+ nick.c_str(), (unsigned long)getSendQSize() + data.length(), 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
- sendq.append(data);
+ WriteData(data);
}
-// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void User::FlushWriteBuf()
+void User::OnError(BufferedSocketError)
{
- if (this->fd == FD_MAGIC_NUMBER)
- {
- sendq.clear();
- return;
- }
+ ServerInstance->Users->QuitUser(this, getError());
+}
- if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+void User::cull()
+{
+ if (!quitting)
+ ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
+ if (IS_LOCAL(this))
{
- int old_sendq_length = sendq.length();
- int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+ if (fd != INT_MAX)
+ Close();
- if (n_sent == -1)
- {
- if (errno == EAGAIN)
- {
- /* The socket buffer is full. This isnt fatal,
- * try again later.
- */
- ServerInstance->SE->WantWrite(this);
- }
- else
- {
- /* Fatal error, set write error and bail */
- ServerInstance->Users->QuitUser(this, errno ? strerror(errno) : "Write error");
- return;
- }
- }
+ std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),this);
+ if (x != ServerInstance->Users->local_users.end())
+ ServerInstance->Users->local_users.erase(x);
else
- {
- /* advance the queue */
- if (n_sent)
- this->sendq = this->sendq.substr(n_sent);
- /* update the user's stats counters */
- this->bytes_out += n_sent;
- this->cmds_out++;
- if (n_sent != old_sendq_length)
- this->ServerInstance->SE->WantWrite(this);
- }
- }
-
- /* note: NOT else if! */
- if (this->sendq.empty())
- {
- FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
+ ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
}
}
/* adds or updates an entry in the whowas list */
void User::AddToWhoWas()
{
- Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
- if (whowas_command)
+ Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so");
+ if (whowas)
{
- std::deque<classbase*> params;
- params.push_back(this);
- whowas_command->HandleInternal(WHOWAS_ADD, params);
+ WhowasRequest req(NULL, whowas, WhowasRequest::WHOWAS_ADD);
+ req.user = this;
+ req.Send();
}
}
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-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
+ this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName);
this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
- this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-1.2 %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, 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());
ModResult MOD_RESULT;
std::string command("LUSERS");
std::vector<std::string> parameters;
- FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
if (!MOD_RESULT)
ServerInstance->CallCommandHandler(command, parameters, this);
this->InvalidateCache();
- this->Extend("NICKForced");
-
- FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (this, newnick));
-
- this->Shrink("NICKForced");
+ NICKForced.set(this, 1);
+ FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+ NICKForced.set(this, 0);
if (MOD_RESULT == MOD_RES_DENY)
{
if (nickhandler) // wtfbbq, when would this not be here
{
std::vector<std::string> parameters;
- nickhandler->HandleInternal(1, dummy);
parameters.push_back(newnick);
- this->Extend("NICKForced");
+ NICKForced.set(this, 1);
bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
- this->Shrink("NICKForced");
- nickhandler->HandleInternal(0, dummy);
+ NICKForced.set(this, 0);
return result;
}
return irc::sockets::aptosa(sip, 0, &client_sa);
}
+static std::string wide_newline("\r\n");
+
void User::Write(const std::string& text)
{
if (!ServerInstance->SE->BoundsCheckFd(this))
return;
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
-
- if (this->GetIOHook())
- {
- /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
- * implement their own buffering mechanisms
- */
- try
- {
- this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length());
- this->GetIOHook()->OnRawSocketWrite(this->fd, "\r\n", 2);
- }
- catch (CoreException& modexcept)
- {
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
- }
- }
- else
+ if (text.length() > MAXBUF - 2)
{
- this->AddWriteBuf(text);
- this->AddWriteBuf("\r\n");
+ // this should happen rarely or never. Crop the string at 512 and try again.
+ std::string try_again = text.substr(0, MAXBUF - 2);
+ Write(try_again);
+ return;
}
+
+ ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+
+ this->AddWriteBuf(text);
+ this->AddWriteBuf(wide_newline);
+
ServerInstance->stats->statsSent += text.length() + 2;
- this->ServerInstance->SE->WantWrite(this);
+ this->bytes_out += text.length() + 2;
+ this->cmds_out++;
}
/** Write()
char textbuffer[MAXBUF];
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(ServerInstance, OnNumeric, MOD_RESULT, (this, numeric, text));
+ FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
if (MOD_RESULT == MOD_RES_DENY)
return;
for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- CUList* ulist = v->first->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ const UserMembList* ulist = (*v)->GetUsers();
+ for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
{
for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- CUList *ulist = v->first->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ const UserMembList* ulist = (*v)->GetUsers();
+ for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
if (this != i->first)
{
for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- CUList *ulist = v->first->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ const UserMembList* ulist = (*v)->GetUsers();
+ for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
if (this != i->first)
{
/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
* by replacing it with a map::find which *should* be more efficient
*/
- if (i->first->HasUser(other))
+ if ((*i)->HasUser(other))
return true;
}
return false;
if (IS_LOCAL(this))
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserGECOS, MOD_RESULT, (this,gecos));
+ FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (this,gecos));
if (MOD_RESULT == MOD_RES_DENY)
return false;
FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
char buffer[MAXBUF];
ModResult result = MOD_RES_PASSTHRU;
- FIRST_MOD_RESULT(ServerInstance, OnHostCycle, result, (this));
+ FIRST_MOD_RESULT(OnHostCycle, result, (this));
if (result == MOD_RES_DENY)
return;
for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
{
- Channel* c = v->first;
+ Channel* c = *v;
snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
std::string joinline(buffer);
- std::string modeline = this->ServerInstance->Modes->ModeString(this, c);
+ std::string modeline = ServerInstance->Modes->ModeString(this, c);
if (modeline.length() > 0)
{
snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str());
modeline = buffer;
}
- CUList *ulist = c->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ const UserMembList *ulist = c->GetUsers();
+ for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
{
User* u = i->first;
if (u == this || !IS_LOCAL(u))
if (IS_LOCAL(this))
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserHost, MOD_RESULT, (this,shost));
+ FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (this,shost));
if (MOD_RESULT == MOD_RES_DENY)
return false;
}
if (this->ident == newident)
return true;
+ FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident));
+
std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
}
-std::string User::ChannelList(User* source)
+std::string User::ChannelList(User* source, bool spy)
{
std::string list;
for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
{
- /* If the target is the same as the sender, let them see all their channels.
- * If the channel is NOT private/secret OR the user shares a common channel
- * If the user is an oper, and the <options:operspywhois> option is set.
+ Channel* c = *i;
+ /* If the target is the sender, neither +p nor +s is set, or
+ * the channel contains the user, it is not a spy channel
*/
- if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
- {
- list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
- }
+ if (spy != (source == this || !(c->IsModeSet('p') || c->IsModeSet('s')) || c->HasUser(source)))
+ list.append(c->GetPrefixChar(this)).append(c->name).append(" ");
}
return list;
// firstly decrement the count on each channel
for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
{
- f->first->RemoveAllPrefixes(this);
- if (f->first->DelUser(this) == 0)
+ 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(f->first);
+ to_delete.push_back(c);
}
catch (...)
{
if (i2 != ServerInstance->chanlist->end())
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, MOD_RESULT, (i2->second));
+ 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));
this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
}
-void User::HandleEvent(EventType et, int errornum)
-{
- if (this->quitting) // drop everything, user is due to be quit
- return;
-
- switch (et)
- {
- case EVENT_READ:
- ServerInstance->ProcessUser(this);
- break;
- case EVENT_WRITE:
- this->FlushWriteBuf();
- break;
- case EVENT_ERROR:
- ServerInstance->Users->QuitUser(this, errornum ? strerror(errornum) : "Client closed the connection");
- break;
- }
-}
-
void User::IncreasePenalty(int increase)
{
this->Penalty += increase;
return nick;
}
-VisData::VisData()
-{
-}
-
-VisData::~VisData()
-{
-}
-
-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)
{
projects / user / henk / code / inspircd.git / blobdiff