#include "bancache.h"
#include "commands/cmd_whowas.h"
-static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
-
/* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 0;
+unsigned long uniq_id = 1;
+
+static unsigned long* already_sent = NULL;
+
+
+void InitializeAlreadySent(SocketEngine* SE)
+{
+ already_sent = new unsigned long[SE->GetMaxFds()];
+ memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
+}
+
std::string User::ProcessNoticeMasks(const char *sm)
{
}
}
else
- this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick, *c);
+ this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
oldadding = adding;
break;
try
{
bool cached;
- const char* sip = this->GetIPString();
+ const char* sip = this->GetIPString(false);
/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
if (!strncmp(sip, "0::ffff:", 8))
User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
{
- *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
reset_due = ServerInstance->Time();
age = ServerInstance->Time();
invites.clear();
memset(modes,0,sizeof(modes));
memset(snomasks,0,sizeof(snomasks));
- /* Invalidate cache */
- cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
if (uid.empty())
- strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
+ uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
else
- strlcpy(uuid, uid.c_str(), UUID_LENGTH);
+ uuid.assign(uid, 0, UUID_LENGTH - 1);
- ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+ 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())
ServerInstance->Users->uuidlist->erase(uuid);
}
-char* User::MakeHost()
+const std::string& User::MakeHost()
{
- if (this->cached_makehost)
+ if (!this->cached_makehost.empty())
return this->cached_makehost;
char nhost[MAXBUF];
/* This is much faster than snprintf */
char* t = nhost;
- for(char* n = ident; *n; n++)
+ for(const char* n = ident.c_str(); *n; n++)
*t++ = *n;
*t++ = '@';
- for(char* n = host; *n; n++)
+ for(const char* n = host.c_str(); *n; n++)
*t++ = *n;
*t = 0;
- this->cached_makehost = strdup(nhost);
+ this->cached_makehost.assign(nhost);
return this->cached_makehost;
}
-char* User::MakeHostIP()
+const std::string& User::MakeHostIP()
{
- if (this->cached_hostip)
+ if (!this->cached_hostip.empty())
return this->cached_hostip;
char ihost[MAXBUF];
/* This is much faster than snprintf */
char* t = ihost;
- for(char* n = ident; *n; n++)
+ for(const char* n = ident.c_str(); *n; n++)
*t++ = *n;
*t++ = '@';
for(const char* n = this->GetIPString(); *n; n++)
*t++ = *n;
*t = 0;
- this->cached_hostip = strdup(ihost);
+ this->cached_hostip = ihost;
return this->cached_hostip;
}
void User::CloseSocket()
{
- ServerInstance->SE->Shutdown(this, 2);
- ServerInstance->SE->Close(this);
+ if (this->fd > -1)
+ {
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
+ }
}
-char* User::GetFullHost()
+const std::string& User::GetFullHost()
{
- if (this->cached_fullhost)
+ if (!this->cached_fullhost.empty())
return this->cached_fullhost;
char result[MAXBUF];
char* t = result;
- for(char* n = nick; *n; n++)
+ for(const char* n = nick.c_str(); *n; n++)
*t++ = *n;
*t++ = '!';
- for(char* n = ident; *n; n++)
+ for(const char* n = ident.c_str(); *n; n++)
*t++ = *n;
*t++ = '@';
- for(char* n = dhost; *n; n++)
+ for(const char* n = dhost.c_str(); *n; n++)
*t++ = *n;
*t = 0;
- this->cached_fullhost = strdup(result);
+ this->cached_fullhost = result;
return this->cached_fullhost;
}
char* t = nresult;
*t++ = '*'; *t++ = '!';
*t++ = '*'; *t++ = '@';
- for(char* n = dhost; *n; n++)
+ for(const char* n = dhost.c_str(); *n; n++)
*t++ = *n;
*t = 0;
return nresult;
}
-char* User::GetFullRealHost()
+const std::string& User::GetFullRealHost()
{
- if (this->cached_fullrealhost)
+ if (!this->cached_fullrealhost.empty())
return this->cached_fullrealhost;
char fresult[MAXBUF];
char* t = fresult;
- for(char* n = nick; *n; n++)
+ for(const char* n = nick.c_str(); *n; n++)
*t++ = *n;
*t++ = '!';
- for(char* n = ident; *n; n++)
+ for(const char* n = ident.c_str(); *n; n++)
*t++ = *n;
*t++ = '@';
- for(char* n = host; *n; n++)
+ for(const char* n = host.c_str(); *n; n++)
*t++ = *n;
*t = 0;
- this->cached_fullrealhost = strdup(fresult);
+ this->cached_fullrealhost = fresult;
return this->cached_fullrealhost;
}
return false;
}
-/** NOTE: We cannot pass a const reference to this method.
- * The string is changed by the workings of the method,
- * so that if we pass const ref, we end up copying it to
- * something we can change anyway. Makes sense to just let
- * the compiler do that copy for us.
- */
-bool User::AddBuffer(std::string a)
+bool User::AddBuffer(const std::string &a)
{
- try
- {
- std::string::size_type i = a.rfind('\r');
+ 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)
{
- a.erase(i, 1);
- i = a.rfind('\r');
- }
+ // Append the chunk that we have
+ recvq.append(a, start, (i - start));
- if (a.length())
- recvq.append(a);
+ // Start looking for the next one
+ start = i + 1;
+ i = a.find('\r', start);
+ }
- if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+ if (start != a.length())
{
- this->SetWriteError("RecvQ exceeded");
- ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %lu",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
- return false;
+ /*
+ * 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));
}
-
- return true;
}
- catch (...)
+ if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
{
- ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::AddBuffer()");
+ this->SetWriteError("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;
}
+
+ return true;
}
bool User::BufferIsReady()
* to repeatedly add the text to the sendq!
*/
this->SetWriteError("SendQ exceeded");
- ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %d exceeds connect class maximum of %lu",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
+ 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;
}
try
{
this->modes[UM_OPERATOR] = 1;
- this->WriteServ("MODE %s :+o", this->nick);
+ 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, this->ident, this->host, opertype.c_str());
- strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
+ 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);
+ opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
if (iter_opertype != ServerInstance->Config->opertypes.end())
{
}
}
- const char* parameters[] = { this->nick, moderemove.c_str() };
- ServerInstance->Parser->CallHandler("MODE", parameters, 2, this);
+ std::vector<std::string> parameters;
+ parameters.push_back(this->nick);
+ parameters.push_back(moderemove);
+
+ ServerInstance->Parser->CallHandler("MODE", parameters, this);
/* unset their oper type (what IS_OPER checks), and remove +o */
- *this->oper = 0;
+ 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 */
}
}
-void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
-{
- Instance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
- user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
- user->quietquit = false;
- user->quitmsg = quitreason;
-
- if (!*operreason)
- user->operquitmsg = quitreason;
- else
- user->operquitmsg = operreason;
-
- Instance->GlobalCulls.AddItem(user);
-}
-
/* adds or updates an entry in the whowas list */
void User::AddToWhoWas()
{
if ((!a) || (a->GetType() == CC_DENY))
{
- User::QuitUser(ServerInstance, this, "Unauthorised connection");
+ ServerInstance->Users->QuitUser(this, "Unauthorised connection");
return;
}
else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
{
- User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
+ ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
return;
}
else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
{
- User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
+ ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
return;
}
this->MaxChans = a->GetMaxChans();
}
+bool User::CheckLines()
+{
+ const char* check[] = { "G" , "K", NULL };
+
+ if (!this->exempt)
+ {
+ for (int n = 0; check[n]; ++n)
+ {
+ XLine *r = ServerInstance->XLines->MatchesLine(check[n], this);
+
+ if (r)
+ {
+ r->Apply(this);
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
void User::FullConnect()
{
ServerInstance->stats->statsConnects++;
*/
if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
{
- User::QuitUser(ServerInstance, this, "Invalid password");
+ ServerInstance->Users->QuitUser(this, "Invalid password");
return;
}
- if (!this->exempt)
- {
- GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this);
-
- if (r)
- {
- r->Apply(this);
- return;
- }
-
- KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this);
-
- if (n)
- {
- n->Apply(this);
- return;
- }
- }
+ 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, ServerInstance->Config->Network, this->nick, this->ident, this->host);
- this->WriteNumeric(002, "%s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
- this->WriteNumeric(003, "%s :This server was created %s %s", this->nick, __TIME__, __DATE__);
- this->WriteNumeric(004, "%s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+ 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());
ServerInstance->Config->Send005(this);
-
- this->WriteNumeric(42, "%s %s :your unique ID", this->nick, this->uuid);
+ this->WriteNumeric(42, "%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", NULL, 0, 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", NULL, 0, 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, this->ident, this->host, this->GetIPString(), this->fullname);
+ 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());
ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
}
//user_hash::iterator newnick;
user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
- if (!strcasecmp(this->nick,New))
+ if (!irc::string(this->nick.c_str()).compare(New))
return oldnick->second;
if (oldnick == ServerInstance->Users->clientlist->end())
void User::InvalidateCache()
{
/* Invalidate cache */
- if (cached_fullhost)
- free(cached_fullhost);
- if (cached_hostip)
- free(cached_hostip);
- if (cached_makehost)
- free(cached_makehost);
- if (cached_fullrealhost)
- free(cached_fullrealhost);
- cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+ cached_fullhost.clear();
+ cached_hostip.clear();
+ cached_makehost.clear();
+ cached_fullrealhost.clear();
}
bool User::ForceNickChange(const char* newnick)
{
- /*
- * XXX this makes no sense..
- * why do we do nothing for change on users not REG_ALL?
- * why do we trigger events twice for everyone previously (and just them now)
- * i think the first if () needs removing totally, or? -- w00t
- */
- if (this->registered != REG_ALL)
- {
- int MOD_RESULT = 0;
-
- this->InvalidateCache();
+ int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+ this->InvalidateCache();
- if (MOD_RESULT)
- {
- ServerInstance->stats->statsCollisions++;
- return false;
- }
+ FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
- if (ServerInstance->XLines->MatchesLine("Q",newnick))
- {
- ServerInstance->stats->statsCollisions++;
- return false;
- }
+ if (MOD_RESULT)
+ {
+ ServerInstance->stats->statsCollisions++;
+ return false;
}
- else
+
+ std::deque<classbase*> dummy;
+ Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+ if (nickhandler) // wtfbbq, when would this not be here
{
- std::deque<classbase*> dummy;
- Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
- if (nickhandler) // wtfbbq, when would this not be here
- {
- nickhandler->HandleInternal(1, dummy);
- bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
- nickhandler->HandleInternal(0, dummy);
- return result;
- }
+ std::vector<std::string> parameters;
+ nickhandler->HandleInternal(1, dummy);
+ parameters.push_back(newnick);
+ bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
+ nickhandler->HandleInternal(0, dummy);
+ return result;
}
- // Unreachable.
+ // Unreachable, we hope
return false;
}
}
break;
default:
- ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+ ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
break;
}
}
return sin->sin_family;
}
-/*
- * XXX the duplication here is horrid..
- * do we really need two methods doing essentially the same thing?
- */
-const char* User::GetIPString()
+const char* User::GetCIDRMask(int range)
{
- static char buf[1024];
+ 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;
+ uint32_t temp;
+ 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)
+ {
+ temp = ntohl(v4.s_addr);
+ temp = (temp >> (32 - range)) << (32 - range);
+ v4.s_addr = htonl(temp);
+ }
+ 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[40];
if (this->ip == NULL)
return "";
{
strlcpy(&temp[1], buf, sizeof(temp) - 1);
*temp = '0';
+ if (translate4in6 && !strncmp(temp, "0::ffff:", 8))
+ {
+ this->cachedip = temp + 8;
+ return temp + 8;
+ }
+
this->cachedip = temp;
return temp;
}
{
char tb[MAXBUF];
- snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+ snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(),text.c_str());
this->Write(std::string(tb));
}
uniq_id++;
+ if (!already_sent)
+ InitializeAlreadySent(ServerInstance->SE);
+
/* We dont want to be doing this n times, just once */
- snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+ snprintf(tb,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
std::string out = tb;
for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
return;
uniq_id++;
- snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost(),normal_text.c_str());
- snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost(),oper_text.c_str());
+
+ if (!already_sent)
+ InitializeAlreadySent(ServerInstance->SE);
+
+ 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());
std::string out1 = tb1;
std::string out2 = tb2;
return;
uniq_id++;
- snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+
+ 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++)
void User::WriteWallOps(const std::string &text)
{
- if (!IS_OPER(this) && IS_LOCAL(this))
+ if (!IS_LOCAL(this))
return;
std::string wallop("WALLOPS :");
void User::WriteWallOps(const char* text, ...)
{
+ if (!IS_LOCAL(this))
+ return;
+
char textbuffer[MAXBUF];
va_list argsPtr;
bool User::ChangeName(const char* gecos)
{
- if (!strcmp(gecos, this->fullname))
+ if (!this->fullname.compare(gecos))
return true;
if (IS_LOCAL(this))
return false;
FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
}
- strlcpy(this->fullname,gecos,MAXGECOS+1);
+ this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
return true;
}
bool User::ChangeDisplayedHost(const char* shost)
{
- if (!strcmp(shost, this->dhost))
+ if (dhost == shost)
return true;
if (IS_LOCAL(this))
this->WriteCommonExcept("QUIT :Changing hosts");
/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
- strlcpy(this->dhost,shost,64);
+ this->dhost.assign(shost, 0, 64);
this->InvalidateCache();
{
for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
{
- i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+ i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
if (n.length() > 0)
- i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+ i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
}
}
if (IS_LOCAL(this))
- this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick,this->dhost);
+ this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
return true;
}
bool User::ChangeIdent(const char* newident)
{
- if (!strcmp(newident, this->ident))
+ if (!this->ident.compare(newident))
return true;
if (this->ServerInstance->Config->CycleHosts)
this->WriteCommonExcept("%s","QUIT :Changing ident");
- strlcpy(this->ident, newident, IDENTMAX+1);
+ this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
this->InvalidateCache();
{
for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
{
- i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+ i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
if (n.length() > 0)
- i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+ i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
}
}
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
+ snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost().c_str(), command, textbuffer);
std::string fmt = formatbuffer;
for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
if (!IS_LOCAL(this))
return NULL;
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid.c_str());
+
if (!explicit_name.empty())
{
for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
{
ConnectClass* c = *i;
- if (explicit_name == c->GetName() && !c->GetDisabled())
+ if (c->GetDisabled())
+ continue; // can't possibly match, removed from conf
+
+ if (explicit_name == c->GetName())
{
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
found = c;
}
}
{
ConnectClass* c = *i;
- if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str()))))
+ if (c->GetType() == CC_ALLOW)
{
- if (c->GetPort())
- {
- if (this->GetPort() == c->GetPort() && !c->GetDisabled())
- {
- found = c;
- }
- else
- continue;
- }
- else
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+ }
+ else
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+ }
+
+ /* if it's disabled, we can't match this one. */
+ if (c->GetDisabled())
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
+ continue;
+ }
+
+ /* check if host matches.. */
+ if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost()))))
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
+ continue;
+ }
+
+ /*
+ * 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 + 1 >= c->limit))
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+ continue;
+ }
+
+ /* if it requires a port ... */
+ if (c->GetPort())
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
+
+ /* and our port doesn't match, fail. */
+ if (this->GetPort() != c->GetPort())
{
- if (!c->GetDisabled())
- found = c;
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+ continue;
}
}
+
+ /* we stop at the first class that meets ALL critera. */
+ found = c;
+ break;
}
}
- /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */
+ /*
+ * Okay, assuming we found a class that matches.. switch us into that class, keeping refcounts up to date.
+ */
if (found)
{
- /* deny change if change will take class over the limit */
- if (found->limit && (found->RefCount + 1 >= found->limit))
- {
- ServerInstance->Logs->Log("USERS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", found->limit);
- return this->MyClass;
- }
-
- /* should always be valid, but just in case .. */
+ /* only fiddle with refcounts if they are already in a class .. */
if (this->MyClass)
{
if (found == this->MyClass) // no point changing this shit :P
{
if (!ServerInstance->Config->MOTD.size())
{
- this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick);
+ this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick.c_str());
return;
}
- this->WriteNumeric(375, "%s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+ this->WriteNumeric(375, "%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,i->c_str());
+ this->WriteNumeric(372, "%s :- %s",this->nick.c_str(),i->c_str());
- this->WriteNumeric(376, "%s :End of message of the day.", this->nick);
+ this->WriteNumeric(376, "%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);
+ this->WriteNumeric(434, "%s :RULES File is missing",this->nick.c_str());
return;
}
- this->WriteNumeric(308, "%s :- %s Server Rules -",this->nick,ServerInstance->Config->ServerName);
+ this->WriteNumeric(308, "%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,i->c_str());
+ this->WriteNumeric(232, "%s :- %s",this->nick.c_str(),i->c_str());
- this->WriteNumeric(309, "%s :End of RULES command.",this->nick);
+ this->WriteNumeric(309, "%s :End of RULES command.",this->nick.c_str());
}
void User::HandleEvent(EventType et, int errornum)
{
if (!WriteError.empty())
{
- User::QuitUser(ServerInstance, this, GetWriteError());
+ ServerInstance->Users->QuitUser(this, GetWriteError());
}
}
}
operquitmsg = oquit;
}
-const char* User::GetOperQuit()
+const std::string& User::GetOperQuit()
{
- return operquitmsg.c_str();
+ return operquitmsg;
}
void User::IncreasePenalty(int increase)
projects / user / henk / code / inspircd.git / blobdiff