* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
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;
const char* sip = this->GetIPString();
UserResolver *res_reverse;
- QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
- // when GetProtocolFamily() works correctly with 4in6, this can be replaced by
- // this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6;
- res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached);
+ QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
+ 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 = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
- reset_due = ServerInstance->Time();
+ server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
age = ServerInstance->Time();
Penalty = 0;
- lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
+ lastping = signon = idle_lastmsg = nping = registered = 0;
bytes_in = bytes_out = cmds_in = cmds_out = 0;
- quietquit = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+ quietquit = quitting = exempt = haspassed = dns_done = false;
fd = -1;
- recvq.clear();
- sendq.clear();
- Visibility = NULL;
- ip = NULL;
+ server_sa.sa.sa_family = AF_UNSPEC;
+ client_sa.sa.sa_family = AF_UNSPEC;
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)
{
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)
this->InvalidateCache();
this->DecrementModes();
- if (ip)
- {
+ if (client_sa.sa.sa_family != AF_UNSPEC)
ServerInstance->Users->RemoveCloneCounts(this);
- if (this->GetProtocolFamily() == AF_INET)
- {
- delete (sockaddr_in*)ip;
- }
-#ifdef SUPPORT_IP6LINKS
- else
- {
- delete (sockaddr_in6*)ip;
- }
-#endif
- }
-
ServerInstance->Users->uuidlist->erase(uuid);
}
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()
+const std::string User::GetFullHost()
{
if (!this->cached_fullhost.empty())
return this->cached_fullhost;
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()
+const std::string User::GetFullRealHost()
{
if (!this->cached_fullrealhost.empty())
return this->cached_fullrealhost;
if (mode < 'A' || mode > ('A' + 64)) return false;
return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
-
+
}
bool User::HasPermission(const std::string &command)
bool User::HasPrivPermission(const std::string &privstr, bool noisy)
{
- ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr);
if (!IS_LOCAL(this))
{
ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
{
if (noisy)
this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
- ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)");
return false;
}
{
if (noisy)
this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
- ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)");
return false;
}
if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
{
- ServerInstance->Logs->Log("PRIVS", DEBUG, "I do have it.");
return true;
}
else if (AllowedPrivs->find("*") != AllowedPrivs->end())
{
- ServerInstance->Logs->Log("PRIVS", DEBUG, "I allow all.");
return true;
}
if (noisy)
this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), this->oper.c_str(), privstr.c_str());
- ServerInstance->Logs->Log("PRIVS", DEBUG, "I don't have it...");
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 && (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'))
+ std::string line;
+ line.reserve(MAXBUF);
+ std::string::size_type qpos = 0;
+ while (qpos < recvq.length())
{
- recvq.erase(t);
- t = recvq.begin();
- }
-
- for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
- {
- /* 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)
+ // Don't bother sending text to remote users!
+ if (IS_REMOTE(this))
return;
-
- if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+ 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;
}
- 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);
+ // We still want to append data to the sendq of a quitting user,
+ // e.g. their ERROR message that says 'closing link'
+
+ 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");
}
}
this->oper.assign(opertype, 0, 512);
ServerInstance->Users->all_opers.push_back(this);
+ /*
+ * This might look like it's in the wrong place.
+ * It is *not*!
+ *
+ * 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());
if (iter_opertype != ServerInstance->Config->opertypes.end())
{
this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
std::string myclass, mycmd, mypriv;
- irc::spacesepstream Classes(iter_opertype->second);
+ irc::spacesepstream Classes(iter_opertype->second.c_str());
while (Classes.GetToken(myclass))
{
operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
this->AllowedPrivs->insert(mypriv);
}
- for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist.c_str(); *c; ++c)
{
if (*c == '*')
{
}
}
- for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+ for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist.c_str(); *c; ++c)
{
if (*c == '*')
{
*/
this->oper.clear();
+
/* Remove all oper only modes from the user when the deoper - Bug #466*/
std::string moderemove("-");
moderemove += letter;
}
+
std::vector<std::string> parameters;
parameters.push_back(this->nick);
parameters.push_back(moderemove);
ServerInstance->Parser->CallHandler("MODE", parameters, this);
-
+
/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
ServerInstance->Users->all_opers.remove(this);
AllowedUserModes.reset();
AllowedChanModes.reset();
+ this->modes[UM_OPERATOR] = 0;
}
}
/* 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();
}
}
{
ConnectClass* a = this->MyClass;
- if ((!a) || (a->GetType() == CC_DENY))
+ if ((!a) || (a->type == CC_DENY))
{
ServerInstance->Users->QuitUser(this, "Unauthorised connection");
return;
else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
{
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());
+ 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()))
{
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());
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
return;
}
bool User::CheckLines(bool doZline)
{
const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
-
+
if (!this->exempt)
{
for (int n = 0; check[n]; ++n)
* Don't remove this! -- w00t
*/
this->SetClass();
-
+
/* 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!
*/
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());
ServerInstance->Users->unregistered_count--;
/* Trigger LUSERS output, give modules a chance too */
- int MOD_RESULT = 0;
+ ModResult MOD_RESULT;
std::string command("LUSERS");
std::vector<std::string> parameters;
- FOREACH_RESULT(I_OnPreCommand, OnPreCommand(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->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());
+ ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]",
+ this->GetServerPort(), 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(), "", "");
}
bool User::ForceNickChange(const char* newnick)
{
- int MOD_RESULT = 0;
+ ModResult MOD_RESULT;
this->InvalidateCache();
- FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+ NICKForced.set(this, 1);
+ FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+ NICKForced.set(this, 0);
- if (MOD_RESULT)
+ if (MOD_RESULT == MOD_RES_DENY)
{
ServerInstance->stats->statsCollisions++;
return false;
if (nickhandler) // wtfbbq, when would this not be here
{
std::vector<std::string> parameters;
- nickhandler->HandleInternal(1, dummy);
parameters.push_back(newnick);
+ NICKForced.set(this, 1);
bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
- nickhandler->HandleInternal(0, dummy);
+ NICKForced.set(this, 0);
return result;
}
return false;
}
-void User::SetSockAddr(int protocol_family, const char* sip, int port)
+int User::GetServerPort()
{
- this->cachedip = "";
-
- switch (protocol_family)
+ switch (this->server_sa.sa.sa_family)
{
-#ifdef SUPPORT_IP6LINKS
case AF_INET6:
- {
- sockaddr_in6* sin = new sockaddr_in6;
- sin->sin6_family = AF_INET6;
- sin->sin6_port = port;
- inet_pton(AF_INET6, sip, &sin->sin6_addr);
- this->ip = (sockaddr*)sin;
- }
- break;
-#endif
+ return htons(this->server_sa.in6.sin6_port);
case AF_INET:
- {
- sockaddr_in* sin = new sockaddr_in;
- sin->sin_family = AF_INET;
- sin->sin_port = port;
- inet_pton(AF_INET, sip, &sin->sin_addr);
- this->ip = (sockaddr*)sin;
- }
- break;
- default:
- ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
- break;
- }
-}
-
-int User::GetPort()
-{
- if (this->ip == NULL)
- return 0;
-
- switch (this->GetProtocolFamily())
- {
-#ifdef SUPPORT_IP6LINKS
- case AF_INET6:
- {
- sockaddr_in6* sin = (sockaddr_in6*)this->ip;
- return sin->sin6_port;
- }
- break;
-#endif
- case AF_INET:
- {
- sockaddr_in* sin = (sockaddr_in*)this->ip;
- return sin->sin_port;
- }
- break;
- default:
- break;
+ return htons(this->server_sa.in4.sin_port);
}
return 0;
}
-int User::GetProtocolFamily()
-{
- if (this->ip == NULL)
- return 0;
-
- sockaddr_in* sin = (sockaddr_in*)this->ip;
- return sin->sin_family;
-}
-
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())
+ switch (this->client_sa.sa.sa_family)
{
-#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];
+ v6.s6_addr[i] = client_sa.in6.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;
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;
+ v4.s_addr = client_sa.in4.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.
return ""; // unused, but oh well
}
-const char* User::GetIPString()
+std::string User::GetServerIP()
{
- static char buf[40];
-
- if (this->ip == NULL)
- return "";
-
- if (!this->cachedip.empty())
- return this->cachedip.c_str();
+ int port;
+ std::string ip;
+ irc::sockets::satoap(&server_sa, ip, port);
+ return ip;
+}
- switch (this->GetProtocolFamily())
+const char* User::GetIPString()
+{
+ int port;
+ if (cachedip.empty())
{
-#ifdef SUPPORT_IP6LINKS
- case AF_INET6:
- {
- static char temp[1024];
-
- sockaddr_in6* sin = (sockaddr_in6*)this->ip;
- inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
- /* IP addresses starting with a : on irc are a Bad Thing (tm) */
- if (*buf == ':')
- {
- strlcpy(&temp[1], buf, sizeof(temp) - 1);
- *temp = '0';
- this->cachedip = temp;
- return temp;
- }
-
- this->cachedip = buf;
- return buf;
- }
- break;
-#endif
- case AF_INET:
- {
- sockaddr_in* sin = (sockaddr_in*)this->ip;
- inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
- this->cachedip = buf;
- return buf;
- }
- break;
- default:
- break;
+ irc::sockets::satoap(&client_sa, cachedip, port);
+ /* IP addresses starting with a : on irc are a Bad Thing (tm) */
+ if (cachedip.c_str()[0] == ':')
+ cachedip.insert(0,1,'0');
}
-
- // Unreachable, probably
- return "";
+
+ return cachedip.c_str();
}
-/** 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.
- */
-void User::Write(std::string text)
+bool User::SetClientIP(const char* sip)
+{
+ this->cachedip = "";
+ 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;
- try
- {
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
- text.append("\r\n");
- }
- catch (...)
+ if (text.length() > MAXBUF - 2)
{
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"Exception in User::Write() std::string::append");
+ // 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;
}
- 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());
- }
- catch (CoreException& modexcept)
- {
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
- }
- }
- else
- {
- this->AddWriteBuf(text);
- }
- ServerInstance->stats->statsSent += text.length();
- this->ServerInstance->SE->WantWrite(this);
+ 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->bytes_out += text.length() + 2;
+ this->cmds_out++;
}
/** Write()
void User::WriteServ(const std::string& text)
{
- char textbuffer[MAXBUF];
-
- snprintf(textbuffer,MAXBUF,":%s %s",ServerInstance->Config->ServerName,text.c_str());
- this->Write(std::string(textbuffer));
+ this->Write(":%s %s",ServerInstance->Config->ServerName,text.c_str());
}
/** WriteServ()
void User::WriteNumeric(unsigned int numeric, const std::string &text)
{
char textbuffer[MAXBUF];
- int MOD_RESULT = 0;
+ ModResult MOD_RESULT;
- FOREACH_RESULT(I_OnNumeric, OnNumeric(this, numeric, text));
+ FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
- if (MOD_RESULT)
+ if (MOD_RESULT == MOD_RES_DENY)
return;
snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str());
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)
{
void User::WriteWallOps(const std::string &text)
{
- if (!IS_LOCAL(this))
- return;
-
std::string wallop("WALLOPS :");
wallop.append(text);
/* 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))
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(this,gecos));
- if (MOD_RESULT)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (this,gecos));
+ if (MOD_RESULT == MOD_RES_DENY)
return false;
FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
}
return true;
}
+void User::DoHostCycle(const std::string &quitline)
+{
+ 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)
+ return;
+
+ uniq_id++;
+
+ if (!already_sent)
+ InitializeAlreadySent(ServerInstance->SE);
+
+ for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+ {
+ Channel* c = *v;
+ snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
+ std::string joinline(buffer);
+ 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;
+ }
+
+ 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))
+ continue;
+
+ if (already_sent[i->first->fd] != uniq_id)
+ {
+ u->Write(quitline);
+ already_sent[i->first->fd] = uniq_id;
+ }
+ u->Write(joinline);
+ if (modeline.length() > 0)
+ u->Write(modeline);
+ }
+ }
+}
+
bool User::ChangeDisplayedHost(const char* shost)
{
if (dhost == shost)
if (IS_LOCAL(this))
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
- if (MOD_RESULT)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (this,shost));
+ if (MOD_RESULT == MOD_RES_DENY)
return false;
}
FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost));
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
-
- if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
- this->WriteCommonExcept("QUIT :Changing hosts");
+ std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host";
/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
this->dhost.assign(shost, 0, 64);
this->InvalidateCache();
- if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
- {
- for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
- {
- 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.c_str(), n.c_str());
- }
- }
+ this->DoHostCycle(quitstr);
if (IS_LOCAL(this))
this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
if (this->ident == newident)
return true;
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+ FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident));
- if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
- this->WriteCommonExcept("%s","QUIT :Changing ident");
+ std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
this->InvalidateCache();
- if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
- {
- for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
- {
- 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.c_str(), n.c_str());
- }
- }
+ this->DoHostCycle(quitstr);
return true;
}
}
-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;
{
ConnectClass* c = *i;
- if (c->GetDisabled())
- continue; // can't possibly match, removed from conf
-
- if (explicit_name == c->GetName())
+ if (explicit_name == c->name)
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
found = c;
{
ConnectClass* c = *i;
- if (c->GetType() == CC_ALLOW)
+ if (c->type == CC_ALLOW)
{
- ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.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 (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
+ if (c->GetHost().length() && !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());
* 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))
+ if (c->limit && (c->RefCount >= c->limit))
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
continue;
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
/* and our port doesn't match, fail. */
- if (this->GetPort() != c->GetPort())
+ if (this->GetServerPort() != c->GetPort())
{
- ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort());
continue;
}
}
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;
// 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 (...)
{
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->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
}
-void User::HandleEvent(EventType et, int errornum)
+void User::IncreasePenalty(int increase)
{
- 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;
- }
+ this->Penalty += increase;
}
-void User::SetOperQuit(const std::string &oquit)
+void User::DecreasePenalty(int decrease)
{
- operquitmsg = oquit;
+ this->Penalty -= decrease;
}
-const std::string& User::GetOperQuit()
+void FakeUser::SetFakeServer(std::string name)
{
- return operquitmsg;
+ this->nick = name;
+ this->server = nick.c_str();
}
-void User::IncreasePenalty(int increase)
+const std::string FakeUser::GetFullHost()
{
- this->Penalty += increase;
+ if (*ServerInstance->Config->HideWhoisServer)
+ return ServerInstance->Config->HideWhoisServer;
+ return nick;
}
-void User::DecreasePenalty(int decrease)
+const std::string FakeUser::GetFullRealHost()
{
- this->Penalty -= decrease;
+ if (*ServerInstance->Config->HideWhoisServer)
+ return ServerInstance->Config->HideWhoisServer;
+ return nick;
}
-VisData::VisData()
+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)
{
}
-VisData::~VisData()
+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)
{
}
-bool VisData::VisibleTo(User* user)
+void ConnectClass::Update(const ConnectClass* src)
{
- return true;
+ name = src->name;
+ registration_timeout = src->registration_timeout;
+ host = src->host;
+ pingtime = src->pingtime;
+ pass = src->pass;
+ hash = src->hash;
+ sendqmax = src->sendqmax;
+ recvqmax = src->recvqmax;
+ maxlocal = src->maxlocal;
+ maxglobal = src->maxglobal;
+ limit = src->limit;
}
-
projects / user / henk / code / inspircd.git / blobdiff