* ---------------------------------------------------
*/
-/* $Core: libIRCDusers */
+/* $Core */
#include "inspircd.h"
#include <stdarg.h>
#include "socketengine.h"
-#include "wildcard.h"
#include "xline.h"
#include "bancache.h"
#include "commands/cmd_whowas.h"
}
}
else
- this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
+ this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
oldadding = adding;
break;
{
try
{
- bool cached;
+ bool cached = false;
const char* sip = this->GetIPString(false);
+ UserResolver *res_reverse;
/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
if (!strncmp(sip, "0::ffff:", 8))
bool User::IsNoticeMaskSet(unsigned char sm)
{
+ if (!isalpha(sm))
+ return false;
return (snomasks[sm-65]);
}
void User::SetNoticeMask(unsigned char sm, bool value)
{
+ if (!isalpha(sm))
+ return;
snomasks[sm-65] = value;
}
return data;
}
-
-
bool User::IsModeSet(unsigned char m)
{
+ if (!isalpha(m))
+ return false;
return (modes[m-65]);
}
void User::SetMode(unsigned char m, bool value)
{
+ if (!isalpha(m))
+ return;
modes[m-65] = value;
}
-const char* User::FormatModes()
+const char* User::FormatModes(bool showparameters)
{
static char data[MAXBUF];
+ std::string params;
int offset = 0;
- for (int n = 0; n < 64; n++)
+
+ for (unsigned char n = 0; n < 64; n++)
{
if (modes[n])
- data[offset++] = n+65;
+ {
+ data[offset++] = n + 65;
+ ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+ if (showparameters && mh && mh->GetNumParams(true))
+ {
+ std::string p = mh->GetUserParameter(this);
+ if (p.length())
+ params.append(" ").append(p);
+ }
+ }
}
data[offset] = 0;
+ strlcat(data, params.c_str(), MAXBUF);
return data;
}
age = ServerInstance->Time();
Penalty = 0;
lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
- ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+ bytes_in = bytes_out = cmds_in = cmds_out = 0;
quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
fd = -1;
recvq.clear();
sendq.clear();
- WriteError.clear();
- res_forward = res_reverse = NULL;
Visibility = NULL;
ip = NULL;
MyClass = NULL;
AllowedOperCommands = NULL;
chans.clear();
invites.clear();
- memset(modes,0,sizeof(modes));
- memset(snomasks,0,sizeof(snomasks));
if (uid.empty())
uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
{
i->second = invtimeout;
}
+
+ return;
}
}
invites.push_back(std::make_pair(channel, invtimeout));
if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
{
- this->SetWriteError("RecvQ exceeded");
+ 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;
}
void User::AddWriteBuf(const std::string &data)
{
- if (*this->GetWriteError())
+ if (this->quitting)
return;
if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
* if we dont it'll recursively call here over and over again trying
* to repeatedly add the text to the sendq!
*/
- this->SetWriteError("SendQ exceeded");
+ 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());
return;
}
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
void User::FlushWriteBuf()
{
- try
+ if (this->fd == FD_MAGIC_NUMBER)
{
- if ((this->fd == FD_MAGIC_NUMBER) || (*this->GetWriteError()))
- {
- sendq.clear();
- }
- if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
- {
- int old_sendq_length = sendq.length();
- int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+ sendq.clear();
+ return;
+ }
+
+ if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+ {
+ int old_sendq_length = sendq.length();
+ int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
- if (n_sent == -1)
+ if (n_sent == -1)
+ {
+ if (errno == EAGAIN)
{
- if (errno == EAGAIN)
- {
- /* The socket buffer is full. This isnt fatal,
- * try again later.
- */
- this->ServerInstance->SE->WantWrite(this);
- }
- else
- {
- /* Fatal error, set write error and bail
- */
- this->SetWriteError(errno ? strerror(errno) : "EOF from client");
- return;
- }
+ /* The socket buffer is full. This isnt fatal,
+ * try again later.
+ */
+ ServerInstance->SE->WantWrite(this);
}
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);
+ /* Fatal error, set write error and bail */
+ ServerInstance->Users->QuitUser(this, errno ? strerror(errno) : "Write error");
+ return;
}
}
+ 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);
+ }
}
- catch (...)
- {
- ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()");
- }
-
+ /* note: NOT else if! */
if (this->sendq.empty())
{
FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
}
}
-void User::SetWriteError(const std::string &error)
-{
- // don't try to set the error twice, its already set take the first string.
- if (this->WriteError.empty())
- this->WriteError = error;
-}
-
-const char* User::GetWriteError()
-{
- return this->WriteError.c_str();
-}
-
void User::Oper(const std::string &opertype, const std::string &opername)
{
char* mycmd;
char* savept;
char* savept2;
- try
- {
- this->modes[UM_OPERATOR] = 1;
- this->WriteServ("MODE %s :+o", this->nick.c_str());
- FOREACH_MOD(I_OnOper, OnOper(this, opertype));
- ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
- this->oper.assign(opertype, 0, ServerInstance->Config->Limits.NickMax);
- ServerInstance->Users->all_opers.push_back(this);
+ if (this->IsModeSet('o'))
+ this->UnOper();
- opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
- if (iter_opertype != ServerInstance->Config->opertypes.end())
- {
+ this->modes[UM_OPERATOR] = 1;
+ this->WriteServ("MODE %s :+o", this->nick.c_str());
+ FOREACH_MOD(I_OnOper, OnOper(this, opertype));
- if (AllowedOperCommands)
- AllowedOperCommands->clear();
- else
- AllowedOperCommands = new std::map<std::string, bool>;
+ ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), irc::Spacify(opertype.c_str()), opername.c_str());
+ this->WriteNumeric(381, "%s :You are now %s %s", this->nick.c_str(), strchr("aeiouAEIOU", *opertype.c_str()) ? "an" : "a", irc::Spacify(opertype.c_str()));
+
+ ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
+ this->oper.assign(opertype, 0, 512);
+ ServerInstance->Users->all_opers.push_back(this);
+
+ opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
+ if (iter_opertype != ServerInstance->Config->opertypes.end())
+ {
- if (!AllowedChanModes)
- AllowedChanModes = new bool[64];
+ if (AllowedOperCommands)
+ AllowedOperCommands->clear();
+ else
+ AllowedOperCommands = new std::map<std::string, bool>;
+
+ if (!AllowedChanModes)
+ AllowedChanModes = new bool[64];
- if (!AllowedUserModes)
- AllowedUserModes = new bool[64];
+ if (!AllowedUserModes)
+ AllowedUserModes = new bool[64];
- memset(AllowedUserModes, 0, 64);
- memset(AllowedChanModes, 0, 64);
+ memset(AllowedUserModes, 0, 64);
+ memset(AllowedChanModes, 0, 64);
- char* Classes = strdup(iter_opertype->second);
- char* myclass = strtok_r(Classes," ",&savept);
- while (myclass)
+ char* Classes = strdup(iter_opertype->second);
+ char* myclass = strtok_r(Classes," ",&savept);
+ while (myclass)
+ {
+ operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
+ if (iter_operclass != ServerInstance->Config->operclass.end())
{
- operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
- if (iter_operclass != ServerInstance->Config->operclass.end())
+ char* CommandList = strdup(iter_operclass->second.commandlist);
+ mycmd = strtok_r(CommandList," ",&savept2);
+ while (mycmd)
+ {
+ this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
+ mycmd = strtok_r(NULL," ",&savept2);
+ }
+ free(CommandList);
+ this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
{
- char* CommandList = strdup(iter_operclass->second.commandlist);
- mycmd = strtok_r(CommandList," ",&savept2);
- while (mycmd)
+ if (*c == '*')
{
- this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
- mycmd = strtok_r(NULL," ",&savept2);
+ memset(this->AllowedUserModes, (int)(true), 64);
}
- free(CommandList);
- this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
- for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
+ else
{
- if (*c == '*')
- {
- memset(this->AllowedUserModes, (int)(true), 64);
- }
- else
- {
- this->AllowedUserModes[*c - 'A'] = true;
- }
+ this->AllowedUserModes[*c - 'A'] = true;
}
- for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+ }
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+ {
+ if (*c == '*')
{
- if (*c == '*')
- {
- memset(this->AllowedChanModes, (int)(true), 64);
- }
- else
- {
- this->AllowedChanModes[*c - 'A'] = true;
- }
+ memset(this->AllowedChanModes, (int)(true), 64);
+ }
+ else
+ {
+ this->AllowedChanModes[*c - 'A'] = true;
}
}
- myclass = strtok_r(NULL," ",&savept);
}
- free(Classes);
+ myclass = strtok_r(NULL," ",&savept);
}
-
- FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
+ free(Classes);
}
- catch (...)
- {
- ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()");
- }
+ FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
}
void User::UnOper()
{
if (IS_OPER(this))
{
+ /*
+ * unset their oper type (what IS_OPER checks).
+ * note, order is important - this must come before modes as -o attempts
+ * to call UnOper. -- w00t
+ */
+ this->oper.clear();
+
/* Remove all oper only modes from the user when the deoper - Bug #466*/
std::string moderemove("-");
for (unsigned char letter = 'A'; letter <= 'z'; letter++)
{
- if (letter != 'o')
- {
- ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
- if (mh && mh->NeedsOper())
- moderemove += letter;
- }
+ ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+ if (mh && mh->NeedsOper())
+ moderemove += letter;
}
std::vector<std::string> parameters;
parameters.push_back(moderemove);
ServerInstance->Parser->CallHandler("MODE", parameters, this);
-
- /* unset their oper type (what IS_OPER checks), and remove +o */
- this->oper.clear();
- this->modes[UM_OPERATOR] = 0;
/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
ServerInstance->Users->all_opers.remove(this);
}
this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
- this->timeout = ServerInstance->Time() + a->GetRegTimeout();
- this->MaxChans = a->GetMaxChans();
}
-void User::CheckLines()
+bool User::CheckLines()
{
const char* check[] = { "G" , "K", NULL };
if (r)
{
r->Apply(this);
- return;
+ return true;
}
}
}
+
+ return false;
}
void User::FullConnect()
return;
}
- CheckLines();
+ if (this->CheckLines())
+ return;
this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
- this->WriteNumeric(001, "%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(002, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
- this->WriteNumeric(003, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
- this->WriteNumeric(004, "%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_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_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());
ServerInstance->Config->Send005(this);
- this->WriteNumeric(42, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
+ this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
this->ShowMOTD();
/* Trigger LUSERS output, give modules a chance too */
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand, OnPreCommand("LUSERS", std::vector<std::string>(), this, true, "LUSERS"));
+ std::string command("LUSERS");
+ std::vector<std::string> parameters;
+ FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS"));
if (!MOD_RESULT)
- ServerInstance->CallCommandHandler("LUSERS", std::vector<std::string>(), this);
+ ServerInstance->CallCommandHandler(command, parameters, this);
/*
* We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
this->registered = REG_ALL;
+ ServerInstance->PI->Introduce(this);
+
FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
return sin->sin_family;
}
-/*
- * XXX the duplication here is horrid..
- * do we really need two methods doing essentially the same thing?
- */
+const char* User::GetCIDRMask(int range)
+{
+ static char buf[44];
+
+ if (this->ip == NULL)
+ return "";
+
+ if (range < 0)
+ throw "Negative range, sorry, no.";
+
+ /*
+ * Original code written by Oliver Lupton (Om).
+ * Integrated by me. Thanks. :) -- w00t
+ */
+ switch (this->GetProtocolFamily())
+ {
+#ifdef SUPPORT_IP6LINKS
+ case AF_INET6:
+ {
+ /* unsigned char s6_addr[16]; */
+ struct in6_addr v6;
+ sockaddr_in6* sin;
+ int i, bytestozero, extrabits;
+ char buffer[40];
+
+ if(range > 128)
+ throw "CIDR mask width greater than address width (IPv6, 128 bit)";
+
+ /* Access the user's IP structure directly */
+ sin = (sockaddr_in6*)this->ip;
+
+ /* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+ * to zero. This means the last (128 - range) bits of the address must be set to zero.
+ * Hence this number divided by 8 is the number of whole bytes from the end of the address
+ * which must be set to zero.
+ */
+ bytestozero = (128 - range) / 8;
+
+ /* Some of the least significant bits of the next most significant byte may also have to
+ * be zeroed. The number of bits is the remainder of the above division.
+ */
+ extrabits = (128 - range) % 8;
+
+ /* Populate our working struct with the parts of the user's IP which are required in the
+ * final CIDR mask. Set all the subsequent bytes to zero.
+ * (16 - bytestozero) is the number of bytes which must be populated with actual IP data.
+ */
+ for(i = 0; i < (16 - bytestozero); i++)
+ {
+ v6.s6_addr[i] = sin->sin6_addr.s6_addr[i];
+ }
+
+ /* And zero all the remaining bytes in the IP. */
+ for(; i < 16; i++)
+ {
+ v6.s6_addr[i] = 0;
+ }
+
+ /* And finally, zero the extra bits required. */
+ v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits;
+
+ snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET6, &v6, buffer, 40), range);
+ return buf;
+ }
+ break;
+#endif
+ case AF_INET:
+ {
+ struct in_addr v4;
+ sockaddr_in* sin;
+ char buffer[16];
+
+ if (range > 32)
+ throw "CIDR mask width greater than address width (IPv4, 32 bit)";
+
+ /* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */
+ sin = (sockaddr_in*)this->ip;
+ v4.s_addr = sin->sin_addr.s_addr;
+
+ /* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+ * to zero. This means the last (32 - range) bits of the address must be set to zero.
+ * This is done by shifting the value right and then back left by (32 - range) bits.
+ */
+ if(range > 0)
+ {
+ v4.s_addr = ntohl(v4.s_addr);
+ v4.s_addr = (v4.s_addr >> (32 - range)) << (32 - range);
+ v4.s_addr = htonl(v4.s_addr);
+ }
+ else
+ {
+ /* a range of zero would cause a 32 bit value to be shifted by 32 bits.
+ * this has undefined behaviour, but for CIDR purposes the resulting mask
+ * from a.b.c.d/0 is 0.0.0.0/0
+ */
+ v4.s_addr = 0;
+ }
+
+ snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET, &v4, buffer, 16), range);
+ return buf;
+ }
+ break;
+ }
+
+ return ""; // unused, but oh well
+}
+
const char* User::GetIPString(bool translate4in6)
{
- static char buf[1024];
+ static char buf[40];
if (this->ip == NULL)
return "";
}
if (IS_LOCAL(this))
- this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
+ this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
return true;
}
}
}
-unsigned int User::GetMaxChans()
-{
- return this->MaxChans;
-}
-
-
/*
* 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.
}
/* check if host matches.. */
- if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost()))))
+ if (!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());
continue;
{
if (!ServerInstance->Config->MOTD.size())
{
- this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick.c_str());
+ this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
return;
}
- this->WriteNumeric(375, "%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);
for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
- this->WriteNumeric(372, "%s :- %s",this->nick.c_str(),i->c_str());
+ this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
- this->WriteNumeric(376, "%s :End of message of the day.", this->nick.c_str());
+ this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
}
void User::ShowRULES()
{
if (!ServerInstance->Config->RULES.size())
{
- this->WriteNumeric(434, "%s :RULES File is missing",this->nick.c_str());
+ this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
return;
}
- this->WriteNumeric(308, "%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);
for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
- this->WriteNumeric(232, "%s :- %s",this->nick.c_str(),i->c_str());
+ this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
- this->WriteNumeric(309, "%s :End of RULES command.",this->nick.c_str());
+ 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;
- /* WARNING: May delete this user! */
- int thisfd = this->GetFd();
-
- try
+ switch (et)
{
- switch (et)
- {
- case EVENT_READ:
- ServerInstance->ProcessUser(this);
- break;
- case EVENT_WRITE:
- this->FlushWriteBuf();
- break;
- case EVENT_ERROR:
- /** This should be safe, but dont DARE do anything after it -- Brain */
- this->SetWriteError(errornum ? strerror(errornum) : "EOF from client");
- break;
- }
- }
- catch (...)
- {
- ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::HandleEvent intercepted");
- }
-
- /* If the user has raised an error whilst being processed, quit them now we're safe to */
- if ((ServerInstance->SE->GetRef(thisfd) == this))
- {
- if (!WriteError.empty())
- {
- ServerInstance->Users->QuitUser(this, GetWriteError());
- }
+ 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;
}
}