X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=d7671de3c8a5a6496cdb26ec1aaebb145a6ba908;hb=2620d1258c6a2c249b9503a7c4a764e26a2da0f3;hp=5617715fdeb6b9a6b3f2524095d416fba8981f74;hpb=31c80e939c429c37421ecad81b22009a81cd757d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 5617715fd..d7671de3c 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,11 +11,14 @@ * --------------------------------------------------- */ +/* $Core: libIRCDusers */ + #include "inspircd.h" #include #include "socketengine.h" #include "wildcard.h" #include "xline.h" +#include "bancache.h" #include "commands/cmd_whowas.h" static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; @@ -23,60 +26,7 @@ static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; /* XXX: Used for speeding up WriteCommon operations */ unsigned long uniq_id = 0; -bool InitTypes(ServerConfig* conf, const char* tag) -{ - if (conf->opertypes.size()) - { - for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++) - { - if (n->second) - delete[] n->second; - } - } - - conf->opertypes.clear(); - return true; -} - -bool InitClasses(ServerConfig* conf, const char* tag) -{ - if (conf->operclass.size()) - { - for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) - { - if (n->second) - delete[] n->second; - } - } - - conf->operclass.clear(); - return true; -} - -bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* TypeName = values[0].GetString(); - const char* Classes = values[1].GetString(); - - conf->opertypes[TypeName] = strnewdup(Classes); - return true; -} - -bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* ClassName = values[0].GetString(); - const char* CommandList = values[1].GetString(); - - conf->operclass[ClassName] = strnewdup(CommandList); - return true; -} - -bool DoneClassesAndTypes(ServerConfig* conf, const char* tag) -{ - return true; -} - -std::string userrec::ProcessNoticeMasks(const char *sm) +std::string User::ProcessNoticeMasks(const char *sm) { bool adding = true, oldadding = false; const char *c = sm; @@ -133,7 +83,7 @@ std::string userrec::ProcessNoticeMasks(const char *sm) return output; } -void userrec::StartDNSLookup() +void User::StartDNSLookup() { try { @@ -154,120 +104,17 @@ void userrec::StartDNSLookup() } } -UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache) : - Resolver(Instance, to_resolve, qt, cache), bound_user(user) -{ - this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA); - this->bound_fd = user->GetFd(); -} - -void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum) -{ - /* We are only interested in the first matching result */ - if (resultnum) - return; - - if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) - { - this->bound_user->stored_host = result; - try - { - /* Check we didnt time out */ - if (this->bound_user->registered != REG_ALL) - { - bool cached; -#ifdef IPV6 - if (this->bound_user->GetProtocolFamily() == AF_INET6) - { - /* IPV6 forward lookup (with possibility of 4in6) */ - const char* ip = this->bound_user->GetIPString(); - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), cached); - } - else - /* IPV4 lookup (mixed protocol mode) */ -#endif - /* IPV4 lookup (ipv4 only mode) */ - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached); - this->ServerInstance->AddResolver(bound_user->res_forward, cached); - } - } - catch (CoreException& e) - { - ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason()); - } - } - else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) - { - /* Both lookups completed */ - std::string result2("0::ffff:"); - result2.append(result); - if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2) - { - std::string hostname = this->bound_user->stored_host; - if (hostname.length() < 65) - { - /* Check we didnt time out */ - if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done)) - { - /* Hostnames starting with : are not a good thing (tm) */ - if (*(hostname.c_str()) == ':') - hostname.insert(0, "0"); - - this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : "")); - this->bound_user->dns_done = true; - strlcpy(this->bound_user->dhost, hostname.c_str(),64); - strlcpy(this->bound_user->host, hostname.c_str(),64); - /* Invalidate cache */ - this->bound_user->InvalidateCache(); - } - } - else - { - if (!this->bound_user->dns_done) - { - this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString()); - this->bound_user->dns_done = true; - } - } - } - else - { - if (!this->bound_user->dns_done) - { - this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString()); - this->bound_user->dns_done = true; - } - } - } -} - -void UserResolver::OnError(ResolverError e, const std::string &errormessage) -{ - if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user) - { - /* Since dns timeout is implemented outside of the resolver, this was a race condition that could result in this message being sent *after* - * the user was fully connected. This check fixes that issue - Special */ - if (!this->bound_user->dns_done) - { - /* Error message here */ - this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString()); - this->bound_user->dns_done = true; - } - } -} - - -bool userrec::IsNoticeMaskSet(unsigned char sm) +bool User::IsNoticeMaskSet(unsigned char sm) { return (snomasks[sm-65]); } -void userrec::SetNoticeMask(unsigned char sm, bool value) +void User::SetNoticeMask(unsigned char sm, bool value) { snomasks[sm-65] = value; } -const char* userrec::FormatNoticeMasks() +const char* User::FormatNoticeMasks() { static char data[MAXBUF]; int offset = 0; @@ -284,17 +131,17 @@ const char* userrec::FormatNoticeMasks() -bool userrec::IsModeSet(unsigned char m) +bool User::IsModeSet(unsigned char m) { return (modes[m-65]); } -void userrec::SetMode(unsigned char m, bool value) +void User::SetMode(unsigned char m, bool value) { modes[m-65] = value; } -const char* userrec::FormatModes() +const char* User::FormatModes() { static char data[MAXBUF]; int offset = 0; @@ -307,28 +154,34 @@ const char* userrec::FormatModes() return data; } -void userrec::DecrementModes() +void User::DecrementModes() { - for (int n = 0; n < 64; n++) + ServerInstance->Log(DEBUG,"DecrementModes()"); + for (unsigned char n = 'A'; n <= 'z'; n++) { - if (modes[n]) + if (modes[n-65]) { - ModeHandler* mh = ServerInstance->Modes->FindMode(n+65, MODETYPE_USER); + ServerInstance->Log(DEBUG,"DecrementModes() found mode %c", n); + ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER); if (mh) + { + ServerInstance->Log(DEBUG,"Found handler %c and call ChangeCount", n); mh->ChangeCount(-1); + } } } } -userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance) +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(true); + Penalty = 0; lines_in = lastping = signon = idle_lastmsg = nping = registered = 0; - ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0; - muted = exempt = haspassed = dns_done = false; + ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0; + OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false; fd = -1; recvq.clear(); sendq.clear(); @@ -336,6 +189,8 @@ userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(In res_forward = res_reverse = NULL; Visibility = NULL; ip = NULL; + MyClass = NULL; + AllowedOperCommands = NULL; chans.clear(); invites.clear(); memset(modes,0,sizeof(modes)); @@ -354,41 +209,30 @@ userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(In if (finduuid == Instance->uuidlist->end()) (*Instance->uuidlist)[uuid] = this; else - throw CoreException("Duplicate UUID "+std::string(uuid)+" in userrec constructor"); + throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor"); } -void userrec::RemoveCloneCounts() +User::~User() { - clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString()); - if (x != ServerInstance->local_clones.end()) + /* NULL for remote users :) */ + if (this->MyClass) { - x->second--; - if (!x->second) - { - ServerInstance->local_clones.erase(x); - } + this->MyClass->RefCount--; + ServerInstance->Log(DEBUG, "User destructor -- connect refcount now: %u", this->MyClass->RefCount); } - - clonemap::iterator y = ServerInstance->global_clones.find(this->GetIPString()); - if (y != ServerInstance->global_clones.end()) + if (this->AllowedOperCommands) { - y->second--; - if (!y->second) - { - ServerInstance->global_clones.erase(y); - } + delete AllowedOperCommands; + AllowedOperCommands = NULL; } -} -userrec::~userrec() -{ this->InvalidateCache(); this->DecrementModes(); if (operquit) free(operquit); if (ip) { - this->RemoveCloneCounts(); + ServerInstance->Users->RemoveCloneCounts(this); if (this->GetProtocolFamily() == AF_INET) { @@ -405,7 +249,7 @@ userrec::~userrec() ServerInstance->uuidlist->erase(uuid); } -char* userrec::MakeHost() +char* User::MakeHost() { if (this->cached_makehost) return this->cached_makehost; @@ -425,7 +269,7 @@ char* userrec::MakeHost() return this->cached_makehost; } -char* userrec::MakeHostIP() +char* User::MakeHostIP() { if (this->cached_hostip) return this->cached_hostip; @@ -445,13 +289,13 @@ char* userrec::MakeHostIP() return this->cached_hostip; } -void userrec::CloseSocket() +void User::CloseSocket() { ServerInstance->SE->Shutdown(this, 2); ServerInstance->SE->Close(this); } -char* userrec::GetFullHost() +char* User::GetFullHost() { if (this->cached_fullhost) return this->cached_fullhost; @@ -473,7 +317,7 @@ char* userrec::GetFullHost() return this->cached_fullhost; } -char* userrec::MakeWildHost() +char* User::MakeWildHost() { static char nresult[MAXBUF]; char* t = nresult; @@ -485,7 +329,7 @@ char* userrec::MakeWildHost() return nresult; } -int userrec::ReadData(void* buffer, size_t size) +int User::ReadData(void* buffer, size_t size) { if (IS_LOCAL(this)) { @@ -500,7 +344,7 @@ int userrec::ReadData(void* buffer, size_t size) } -char* userrec::GetFullRealHost() +char* User::GetFullRealHost() { if (this->cached_fullrealhost) return this->cached_fullrealhost; @@ -522,7 +366,7 @@ char* userrec::GetFullRealHost() return this->cached_fullrealhost; } -bool userrec::IsInvited(const irc::string &channel) +bool User::IsInvited(const irc::string &channel) { for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++) { @@ -534,17 +378,17 @@ bool userrec::IsInvited(const irc::string &channel) return false; } -InvitedList* userrec::GetInviteList() +InvitedList* User::GetInviteList() { return &invites; } -void userrec::InviteTo(const irc::string &channel) +void User::InviteTo(const irc::string &channel) { invites.push_back(channel); } -void userrec::RemoveInvite(const irc::string &channel) +void User::RemoveInvite(const irc::string &channel) { for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++) { @@ -556,12 +400,8 @@ void userrec::RemoveInvite(const irc::string &channel) } } -bool userrec::HasPermission(const std::string &command) +bool User::HasPermission(const std::string &command) { - char* mycmd; - char* savept; - char* savept2; - /* * users on remote servers can completely bypass all permissions based checks. * This prevents desyncs when one server has different type/class tags to another. @@ -573,37 +413,19 @@ bool userrec::HasPermission(const std::string &command) return true; // are they even an oper at all? - if (IS_OPER(this)) + if (!IS_OPER(this)) { - opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper); - if (iter_opertype != ServerInstance->Config->opertypes.end()) - { - 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()) - { - char* CommandList = strdup(iter_operclass->second); - mycmd = strtok_r(CommandList," ",&savept2); - while (mycmd) - { - if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*')) - { - free(Classes); - free(CommandList); - return true; - } - mycmd = strtok_r(NULL," ",&savept2); - } - free(CommandList); - } - myclass = strtok_r(NULL," ",&savept); - } - free(Classes); - } + return false; } + + if (!AllowedOperCommands) + return false; + + if (AllowedOperCommands->find(command) != AllowedOperCommands->end()) + return true; + else if (AllowedOperCommands->find("*") != AllowedOperCommands->end()) + return true; + return false; } @@ -613,7 +435,7 @@ bool userrec::HasPermission(const std::string &command) * something we can change anyway. Makes sense to just let * the compiler do that copy for us. */ -bool userrec::AddBuffer(std::string a) +bool User::AddBuffer(std::string a) { try { @@ -628,10 +450,10 @@ bool userrec::AddBuffer(std::string a) if (a.length()) recvq.append(a); - if (recvq.length() > (unsigned)this->recvqmax) + if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax())) { this->SetWriteError("RecvQ exceeded"); - ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax); + ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax()); return false; } @@ -640,26 +462,26 @@ bool userrec::AddBuffer(std::string a) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()"); + ServerInstance->Log(DEBUG,"Exception in User::AddBuffer()"); return false; } } -bool userrec::BufferIsReady() +bool User::BufferIsReady() { return (recvq.find('\n') != std::string::npos); } -void userrec::ClearBuffer() +void User::ClearBuffer() { recvq.clear(); } -std::string userrec::GetBuffer() +std::string User::GetBuffer() { try { - if (!recvq.length()) + if (recvq.empty()) return ""; /* Strip any leading \r or \n off the string. @@ -690,17 +512,17 @@ std::string userrec::GetBuffer() catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()"); + ServerInstance->Log(DEBUG,"Exception in User::GetBuffer()"); return ""; } } -void userrec::AddWriteBuf(const std::string &data) +void User::AddWriteBuf(const std::string &data) { if (*this->GetWriteError()) return; - if (sendq.length() + data.length() > (unsigned)this->sendqmax) + if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax())) { /* * Fix by brain - Set the error text BEFORE calling writeopers, because @@ -708,7 +530,7 @@ void userrec::AddWriteBuf(const std::string &data) * to repeatedly add the text to the sendq! */ this->SetWriteError("SendQ exceeded"); - ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax); + ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax()); return; } @@ -727,7 +549,7 @@ void userrec::AddWriteBuf(const std::string &data) } // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it) -void userrec::FlushWriteBuf() +void User::FlushWriteBuf() { try { @@ -773,7 +595,7 @@ void userrec::FlushWriteBuf() catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()"); + ServerInstance->Log(DEBUG,"Exception in User::FlushWriteBuf()"); } if (this->sendq.empty()) @@ -782,7 +604,7 @@ void userrec::FlushWriteBuf() } } -void userrec::SetWriteError(const std::string &error) +void User::SetWriteError(const std::string &error) { try { @@ -793,17 +615,21 @@ void userrec::SetWriteError(const std::string &error) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()"); + ServerInstance->Log(DEBUG,"Exception in User::SetWriteError()"); } } -const char* userrec::GetWriteError() +const char* User::GetWriteError() { return this->WriteError.c_str(); } -void userrec::Oper(const std::string &opertype) +void User::Oper(const std::string &opertype, const std::string &opername) { + char* mycmd; + char* savept; + char* savept2; + try { this->modes[UM_OPERATOR] = 1; @@ -812,16 +638,47 @@ void userrec::Oper(const std::string &opertype) ServerInstance->Log(DEFAULT,"OPER: %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->all_opers.push_back(this); - FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype)); + + opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper); + if (iter_opertype != ServerInstance->Config->opertypes.end()) + { + + if (AllowedOperCommands) + AllowedOperCommands->clear(); + else + AllowedOperCommands = new std::map; + + 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()) + { + char* CommandList = strdup(iter_operclass->second); + mycmd = strtok_r(CommandList," ",&savept2); + while (mycmd) + { + this->AllowedOperCommands->insert(std::make_pair(mycmd, true)); + mycmd = strtok_r(NULL," ",&savept2); + } + free(CommandList); + } + myclass = strtok_r(NULL," ",&savept); + } + free(Classes); + } + + FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::Oper()"); + ServerInstance->Log(DEBUG,"Exception in User::Oper()"); } } -void userrec::UnOper() +void User::UnOper() { try { @@ -830,35 +687,36 @@ void userrec::UnOper() // unset their oper type (what IS_OPER checks), and remove +o *this->oper = 0; this->modes[UM_OPERATOR] = 0; + + // remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 + ServerInstance->all_opers.remove(this); - // remove them from the opers list. - for (std::vector::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++) + if (AllowedOperCommands) { - if (*a == this) - { - ServerInstance->all_opers.erase(a); - return; - } + delete AllowedOperCommands; + AllowedOperCommands = NULL; } } } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()"); + ServerInstance->Log(DEBUG,"Exception in User::UnOper()"); } } -void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason, const char* operreason) +void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason) { + Instance->Log(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->muted = true; Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason); } /* adds or updates an entry in the whowas list */ -void userrec::AddToWhoWas() +void User::AddToWhoWas() { - command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); + Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; @@ -867,235 +725,75 @@ void userrec::AddToWhoWas() } } -/* add a client connection to the sockets list */ -void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip) -{ - /* NOTE: Calling this one parameter constructor for userrec automatically - * allocates a new UUID and places it in the hash_map. - */ - userrec* New = NULL; - try - { - New = new userrec(Instance); - } - catch (CoreException &e) - { - Instance->Log(DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); - Instance->WriteOpers("*** WARNING *** Duplicate UUID allocated!"); - return; - } - - int j = 0; - - Instance->unregistered_count++; - - char ipaddr[MAXBUF]; -#ifdef IPV6 - if (socketfamily == AF_INET6) - inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr)); - else -#endif - inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr)); - - (*(Instance->clientlist))[New->uuid] = New; - New->SetFd(socket); - - /* The users default nick is their UUID */ - strlcpy(New->nick, New->uuid, NICKMAX - 1); - - New->server = Instance->FindServerNamePtr(Instance->Config->ServerName); - /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */ - strcpy(New->ident, "unknown"); - - New->registered = REG_NONE; - New->signon = Instance->Time() + Instance->Config->dns_timeout; - New->lastping = 1; - - New->SetSockAddr(socketfamily, ipaddr, port); - - /* Smarter than your average bear^H^H^H^Hset of strlcpys. */ - for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++) - New->dhost[j] = New->host[j] = *temp; - New->dhost[j] = New->host[j] = 0; - - Instance->AddLocalClone(New); - Instance->AddGlobalClone(New); - - /* - * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved. - * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t - */ - ConnectClass* i = New->GetClass(); - - if (!i) - { - userrec::QuitUser(Instance, New, "Access denied by configuration"); - return; - } - - /* - * Check connect class settings and initialise settings into userrec. - * This will be done again after DNS resolution. -- w00t - */ - New->CheckClass(); - - Instance->local_users.push_back(New); - - if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS)) - { - Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); - userrec::QuitUser(Instance, New,"No more connections allowed"); - return; - } - - /* - * XXX - - * this is done as a safety check to keep the file descriptors within range of fd_ref_table. - * its a pretty big but for the moment valid assumption: - * file descriptors are handed out starting at 0, and are recycled as theyre freed. - * therefore if there is ever an fd over 65535, 65536 clients must be connected to the - * irc server at once (or the irc server otherwise initiating this many connections, files etc) - * which for the time being is a physical impossibility (even the largest networks dont have more - * than about 10,000 users on ONE server!) - */ -#ifndef WINDOWS - if ((unsigned int)socket >= MAX_DESCRIPTORS) - { - userrec::QuitUser(Instance, New, "Server is full"); - return; - } -#endif - - New->exempt = (Instance->XLines->matches_exception(New) != NULL); - if (!New->exempt) - { - ZLine* r = Instance->XLines->matches_zline(ipaddr); - if (r) - { - char reason[MAXBUF]; - if (*Instance->Config->MoronBanner) - New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner); - snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason); - userrec::QuitUser(Instance, New, reason); - return; - } - } - - if (socket > -1) - { - if (!Instance->SE->AddFd(New)) - { - userrec::QuitUser(Instance, New, "Internal error handling connection"); - return; - } - } - - /* NOTE: even if dns lookups are *off*, we still need to display this. - * BOPM and other stuff requires it. - */ - New->WriteServ("NOTICE Auth :*** Looking up your hostname..."); -} - -unsigned long userrec::GlobalCloneCount() -{ - clonemap::iterator x = ServerInstance->global_clones.find(this->GetIPString()); - if (x != ServerInstance->global_clones.end()) - return x->second; - else - return 0; -} - -unsigned long userrec::LocalCloneCount() -{ - clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString()); - if (x != ServerInstance->local_clones.end()) - return x->second; - else - return 0; -} - /* * Check class restrictions */ -void userrec::CheckClass(const std::string &explicit_class) +void User::CheckClass() { - ConnectClass* a = this->GetClass(explicit_class); + ConnectClass* a = this->MyClass; if ((!a) || (a->GetType() == CC_DENY)) { - userrec::QuitUser(ServerInstance, this, "Unauthorised connection"); + User::QuitUser(ServerInstance, this, "Unauthorised connection"); return; } - else if ((a->GetMaxLocal()) && (this->LocalCloneCount() > a->GetMaxLocal())) + else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { - userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)"); + User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)"); ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); return; } - else if ((a->GetMaxGlobal()) && (this->GlobalCloneCount() > a->GetMaxGlobal())) + else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { - userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)"); + User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)"); ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); return; } - this->pingmax = a->GetPingTime(); this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout; this->timeout = ServerInstance->Time() + a->GetRegTimeout(); - this->flood = a->GetFlood(); - this->threshold = a->GetThreshold(); - this->sendqmax = a->GetSendqMax(); - this->recvqmax = a->GetRecvqMax(); this->MaxChans = a->GetMaxChans(); } -void userrec::FullConnect() +void User::FullConnect() { ServerInstance->stats->statsConnects++; this->idle_lastmsg = ServerInstance->Time(); /* - * You may be thinking "wtf, we checked this in userrec::AddClient!" - and yes, we did, BUT. + * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT. * At the time AddClient is called, we don't have a resolved host, by here we probably do - which * may put the user into a totally seperate class with different restrictions! so we *must* check again. * Don't remove this! -- w00t */ - this->CheckClass(); + 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! */ - if ((!this->GetClass()->GetPass().empty()) && (!this->haspassed)) + if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed) { - userrec::QuitUser(ServerInstance, this, "Invalid password"); + User::QuitUser(ServerInstance, this, "Invalid password"); return; } - + if (!this->exempt) { - GLine* r = ServerInstance->XLines->matches_gline(this); + GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this); if (r) { this->muted = true; - char reason[MAXBUF]; - if (*ServerInstance->Config->MoronBanner) - this->WriteServ("NOTICE %s :*** %s", this->nick, ServerInstance->Config->MoronBanner); - snprintf(reason,MAXBUF,"G-Lined: %s",r->reason); - userrec::QuitUser(ServerInstance, this, reason); + r->Apply(this); return; } - KLine* n = ServerInstance->XLines->matches_kline(this); + KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this); if (n) { this->muted = true; - char reason[MAXBUF]; - if (*ServerInstance->Config->MoronBanner) - this->WriteServ("NOTICE %s :*** %s", this, ServerInstance->Config->MoronBanner); - snprintf(reason,MAXBUF,"K-Lined: %s",n->reason); - userrec::QuitUser(ServerInstance, this, reason); + n->Apply(this); return; } } @@ -1124,8 +822,8 @@ void userrec::FullConnect() ServerInstance->CallCommandHandler("LUSERS", NULL, 0, this); /* - * fix 3 by brain, move registered = 7 below these so that spurious modes and host - * changes dont go out onto the network and produce 'fake direction'. + * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff + * for a user that doesn't exist yet. */ FOREACH_MOD(I_OnUserConnect,OnUserConnect(this)); @@ -1134,13 +832,16 @@ void userrec::FullConnect() 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->Log(DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString()); + ServerInstance->BanCache->AddHit(this->GetIPString(), "", ""); } -/** userrec::UpdateNick() +/** User::UpdateNick() * re-allocates a nick in the user_hash after they change nicknames, * returns a pointer to the new user as it may have moved */ -userrec* userrec::UpdateNickHash(const char* New) +User* User::UpdateNickHash(const char* New) { try { @@ -1153,7 +854,7 @@ userrec* userrec::UpdateNickHash(const char* New) if (oldnick == ServerInstance->clientlist->end()) return NULL; /* doesnt exist */ - userrec* olduser = oldnick->second; + User* olduser = oldnick->second; (*(ServerInstance->clientlist))[New] = olduser; ServerInstance->clientlist->erase(oldnick); return olduser; @@ -1161,12 +862,12 @@ userrec* userrec::UpdateNickHash(const char* New) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()"); + ServerInstance->Log(DEBUG,"Exception in User::UpdateNickHash()"); return NULL; } } -void userrec::InvalidateCache() +void User::InvalidateCache() { /* Invalidate cache */ if (cached_fullhost) @@ -1180,7 +881,7 @@ void userrec::InvalidateCache() cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL; } -bool userrec::ForceNickChange(const char* newnick) +bool User::ForceNickChange(const char* newnick) { try { @@ -1196,7 +897,7 @@ bool userrec::ForceNickChange(const char* newnick) return false; } - if (ServerInstance->XLines->matches_qline(newnick)) + if (ServerInstance->XLines->MatchesLine("Q",newnick)) { ServerInstance->stats->statsCollisions++; return false; @@ -1205,7 +906,7 @@ bool userrec::ForceNickChange(const char* newnick) if (this->registered == REG_ALL) { std::deque dummy; - command_t* nickhandler = ServerInstance->Parser->GetHandler("NICK"); + Command* nickhandler = ServerInstance->Parser->GetHandler("NICK"); if (nickhandler) { nickhandler->HandleInternal(1, dummy); @@ -1219,12 +920,12 @@ bool userrec::ForceNickChange(const char* newnick) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()"); + ServerInstance->Log(DEBUG,"Exception in User::ForceNickChange()"); return false; } } -void userrec::SetSockAddr(int protocol_family, const char* ip, int port) +void User::SetSockAddr(int protocol_family, const char* ip, int port) { switch (protocol_family) { @@ -1249,12 +950,12 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port) } break; default: - ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick); + ServerInstance->Log(DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick); break; } } -int userrec::GetPort() +int User::GetPort() { if (this->ip == NULL) return 0; @@ -1281,7 +982,7 @@ int userrec::GetPort() return 0; } -int userrec::GetProtocolFamily() +int User::GetProtocolFamily() { if (this->ip == NULL) return 0; @@ -1290,7 +991,11 @@ int userrec::GetProtocolFamily() return sin->sin_family; } -const char* userrec::GetIPString() +/* + * XXX the duplication here is horrid.. + * do we really need two methods doing essentially the same thing? + */ +const char* User::GetIPString() { static char buf[1024]; @@ -1330,55 +1035,13 @@ const char* userrec::GetIPString() return ""; } -const char* userrec::GetIPString(char* buf) -{ - if (this->ip == NULL) - { - *buf = 0; - return buf; - } - - switch (this->GetProtocolFamily()) - { -#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'; - strlcpy(buf, temp, sizeof(temp)); - } - 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)); - return buf; - } - break; - - default: - break; - } - return ""; -} - /** 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 userrec::Write(std::string text) +void User::Write(std::string text) { if (!ServerInstance->SE->BoundsCheckFd(this)) return; @@ -1394,7 +1057,7 @@ void userrec::Write(std::string text) } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append"); + ServerInstance->Log(DEBUG,"Exception in User::Write() std::string::append"); return; } @@ -1422,7 +1085,7 @@ void userrec::Write(std::string text) /** Write() */ -void userrec::Write(const char *text, ...) +void User::Write(const char *text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -1434,7 +1097,7 @@ void userrec::Write(const char *text, ...) this->Write(std::string(textbuffer)); } -void userrec::WriteServ(const std::string& text) +void User::WriteServ(const std::string& text) { char textbuffer[MAXBUF]; @@ -1445,7 +1108,7 @@ void userrec::WriteServ(const std::string& text) /** WriteServ() * Same as Write(), except `text' is prefixed with `:server.name '. */ -void userrec::WriteServ(const char* text, ...) +void User::WriteServ(const char* text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -1458,7 +1121,7 @@ void userrec::WriteServ(const char* text, ...) } -void userrec::WriteFrom(userrec *user, const std::string &text) +void User::WriteFrom(User *user, const std::string &text) { char tb[MAXBUF]; @@ -1470,7 +1133,7 @@ void userrec::WriteFrom(userrec *user, const std::string &text) /* write text from an originating user to originating user */ -void userrec::WriteFrom(userrec *user, const char* text, ...) +void User::WriteFrom(User *user, const char* text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -1485,7 +1148,7 @@ void userrec::WriteFrom(userrec *user, const char* text, ...) /* write text to an destination user from a source user (e.g. user privmsg) */ -void userrec::WriteTo(userrec *dest, const char *data, ...) +void User::WriteTo(User *dest, const char *data, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -1497,13 +1160,13 @@ void userrec::WriteTo(userrec *dest, const char *data, ...) this->WriteTo(dest, std::string(textbuffer)); } -void userrec::WriteTo(userrec *dest, const std::string &data) +void User::WriteTo(User *dest, const std::string &data) { dest->WriteFrom(this, data); } -void userrec::WriteCommon(const char* text, ...) +void User::WriteCommon(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -1518,7 +1181,7 @@ void userrec::WriteCommon(const char* text, ...) this->WriteCommon(std::string(textbuffer)); } -void userrec::WriteCommon(const std::string &text) +void User::WriteCommon(const std::string &text) { try { @@ -1560,7 +1223,7 @@ void userrec::WriteCommon(const std::string &text) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()"); + ServerInstance->Log(DEBUG,"Exception in User::WriteCommon()"); } } @@ -1569,7 +1232,7 @@ void userrec::WriteCommon(const std::string &text) * channel, NOT including the source user e.g. for use in QUIT */ -void userrec::WriteCommonExcept(const char* text, ...) +void User::WriteCommonExcept(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -1581,7 +1244,7 @@ void userrec::WriteCommonExcept(const char* text, ...) this->WriteCommonExcept(std::string(textbuffer)); } -void userrec::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text) +void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text) { char tb1[MAXBUF]; char tb2[MAXBUF]; @@ -1612,7 +1275,7 @@ void userrec::WriteCommonQuit(const std::string &normal_text, const std::string } } -void userrec::WriteCommonExcept(const std::string &text) +void User::WriteCommonExcept(const std::string &text) { char tb1[MAXBUF]; std::string out1; @@ -1642,7 +1305,7 @@ void userrec::WriteCommonExcept(const std::string &text) } -void userrec::WriteWallOps(const std::string &text) +void User::WriteWallOps(const std::string &text) { if (!IS_OPER(this) && IS_LOCAL(this)) return; @@ -1650,15 +1313,15 @@ void userrec::WriteWallOps(const std::string &text) std::string wallop("WALLOPS :"); wallop.append(text); - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) { - userrec* t = *i; + User* t = *i; if (t->IsModeSet('w')) this->WriteTo(t,wallop); } } -void userrec::WriteWallOps(const char* text, ...) +void User::WriteWallOps(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -1677,12 +1340,12 @@ void userrec::WriteWallOps(const char* text, ...) * the first users channels then the second users channels within the outer loop, * therefore it was a maximum of x*y iterations (upon returning 0 and checking * all possible iterations). However this new function instead checks against the - * channel's userlist in the inner loop which is a std::map + * channel's userlist in the inner loop which is a std::map * and saves us time as we already know what pointer value we are after. * Don't quote me on the maths as i am not a mathematician or computer scientist, * but i believe this algorithm is now x+(log y) maximum iterations instead. */ -bool userrec::SharesChannelWith(userrec *other) +bool User::SharesChannelWith(User *other) { if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL)) return false; @@ -1699,7 +1362,7 @@ bool userrec::SharesChannelWith(userrec *other) return false; } -bool userrec::ChangeName(const char* gecos) +bool User::ChangeName(const char* gecos) { if (!strcmp(gecos, this->fullname)) return true; @@ -1717,7 +1380,7 @@ bool userrec::ChangeName(const char* gecos) return true; } -bool userrec::ChangeDisplayedHost(const char* host) +bool User::ChangeDisplayedHost(const char* host) { if (!strcmp(host, this->dhost)) return true; @@ -1733,7 +1396,7 @@ bool userrec::ChangeDisplayedHost(const char* host) if (this->ServerInstance->Config->CycleHosts) this->WriteCommonExcept("QUIT :Changing hosts"); - /* Fix by Om: userrec::dhost is 65 long, this was truncating some long hosts */ + /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */ strlcpy(this->dhost,host,64); this->InvalidateCache(); @@ -1755,7 +1418,7 @@ bool userrec::ChangeDisplayedHost(const char* host) return true; } -bool userrec::ChangeIdent(const char* newident) +bool User::ChangeIdent(const char* newident) { if (!strcmp(newident, this->ident)) return true; @@ -1781,7 +1444,7 @@ bool userrec::ChangeIdent(const char* newident) return true; } -void userrec::SendAll(const char* command, char* text, ...) +void User::SendAll(const char* command, char* text, ...) { char textbuffer[MAXBUF]; char formatbuffer[MAXBUF]; @@ -1794,14 +1457,14 @@ void userrec::SendAll(const char* command, char* text, ...) snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer); std::string fmt = formatbuffer; - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) { (*i)->Write(fmt); } } -std::string userrec::ChannelList(userrec* source) +std::string User::ChannelList(User* source) { try { @@ -1821,12 +1484,12 @@ std::string userrec::ChannelList(userrec* source) } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()"); + ServerInstance->Log(DEBUG,"Exception in User::ChannelList()"); return ""; } } -void userrec::SplitChanList(userrec* dest, const std::string &cl) +void User::SplitChanList(User* dest, const std::string &cl) { std::string line; std::ostringstream prefix; @@ -1867,54 +1530,108 @@ void userrec::SplitChanList(userrec* dest, const std::string &cl) catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()"); + ServerInstance->Log(DEBUG,"Exception in User::SplitChanList()"); } } -unsigned int userrec::GetMaxChans() +unsigned int User::GetMaxChans() { return this->MaxChans; } -/* looks up a users password for their connection class (/ tags) + +/* + * 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. * NOTE: If the or tag specifies an ip, and this user resolves, * then their ip will be taken as 'priority' anyway, so for example, * will match joe!bloggs@localhost */ -ConnectClass* userrec::GetClass(const std::string &explicit_name) +ConnectClass* User::SetClass(const std::string &explicit_name) { + ConnectClass *found = NULL; + + if (!IS_LOCAL(this)) + return NULL; + if (!explicit_name.empty()) { for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) { - if (explicit_name == i->GetName()) - return &(*i); + ConnectClass* c = *i; + + if (explicit_name == c->GetName() && !c->GetDisabled()) + { + found = c; + } } } else { for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) { - if (((match(this->GetIPString(),i->GetHost().c_str(),true)) || (match(this->host,i->GetHost().c_str())))) + ConnectClass* c = *i; + + if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str())))) { - if (i->GetPort()) + if (c->GetPort()) { - if (this->GetPort() == i->GetPort()) - return &(*i); + if (this->GetPort() == c->GetPort() && !c->GetDisabled()) + { + found = c; + } else continue; } else - return &(*i); + { + if (!c->GetDisabled()) + found = c; + } } } } - return NULL; + + /* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */ + if (found) + { + /* deny change if change will take class over the limit */ + if (found->limit && (found->RefCount + 1 >= found->limit)) + { + ServerInstance->Log(DEBUG, "OOPS: Connect class limit (%u) hit, denying", found->limit); + return this->MyClass; + } + + /* should always be valid, but just in case .. */ + if (this->MyClass) + { + if (found == this->MyClass) // no point changing this shit :P + return this->MyClass; + this->MyClass->RefCount--; + ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount); + } + + this->MyClass = found; + this->MyClass->RefCount++; + ServerInstance->Log(DEBUG, "User tied to new class -- connect refcount now: %u", this->MyClass->RefCount); + } + + return this->MyClass; } -void userrec::PurgeEmptyChannels() +/* looks up a users password for their connection class (/ tags) + * NOTE: If the or tag specifies an ip, and this user resolves, + * then their ip will be taken as 'priority' anyway, so for example, + * will match joe!bloggs@localhost + */ +ConnectClass* User::GetClass() { - std::vector to_delete; + return this->MyClass; +} + +void User::PurgeEmptyChannels() +{ + std::vector to_delete; // firstly decrement the count on each channel for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++) @@ -1929,19 +1646,19 @@ void userrec::PurgeEmptyChannels() } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()"); + ServerInstance->Log(DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()"); } } } - for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) + for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) { - chanrec* thischan = *n; + Channel* thischan = *n; chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name); if (i2 != ServerInstance->chanlist->end()) { FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); - DELETE(i2->second); + delete i2->second; ServerInstance->chanlist->erase(i2); this->chans.erase(*n); } @@ -1950,7 +1667,7 @@ void userrec::PurgeEmptyChannels() this->UnOper(); } -void userrec::ShowMOTD() +void User::ShowMOTD() { if (!ServerInstance->Config->MOTD.size()) { @@ -1965,7 +1682,7 @@ void userrec::ShowMOTD() this->WriteServ("376 %s :End of message of the day.", this->nick); } -void userrec::ShowRULES() +void User::ShowRULES() { if (!ServerInstance->Config->RULES.size()) { @@ -1981,7 +1698,7 @@ void userrec::ShowRULES() this->WriteServ("309 %s :End of RULES command.",this->nick); } -void userrec::HandleEvent(EventType et, int errornum) +void User::HandleEvent(EventType et, int errornum) { /* WARNING: May delete this user! */ int thisfd = this->GetFd(); @@ -2004,7 +1721,7 @@ void userrec::HandleEvent(EventType et, int errornum) } catch (...) { - ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted"); + ServerInstance->Log(DEBUG,"Exception in User::HandleEvent intercepted"); } /* If the user has raised an error whilst being processed, quit them now we're safe to */ @@ -2012,12 +1729,12 @@ void userrec::HandleEvent(EventType et, int errornum) { if (!WriteError.empty()) { - userrec::QuitUser(ServerInstance, this, GetWriteError()); + User::QuitUser(ServerInstance, this, GetWriteError()); } } } -void userrec::SetOperQuit(const std::string &oquit) +void User::SetOperQuit(const std::string &oquit) { if (operquit) return; @@ -2025,11 +1742,21 @@ void userrec::SetOperQuit(const std::string &oquit) operquit = strdup(oquit.c_str()); } -const char* userrec::GetOperQuit() +const char* User::GetOperQuit() { return operquit ? operquit : ""; } +void User::IncreasePenalty(int increase) +{ + this->Penalty += increase; +} + +void User::DecreasePenalty(int decrease) +{ + this->Penalty -= decrease; +} + VisData::VisData() { } @@ -2038,7 +1765,7 @@ VisData::~VisData() { } -bool VisData::VisibleTo(userrec* user) +bool VisData::VisibleTo(User* user) { return true; }