X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=2eebb1ed029f2c5035055d520b4df43aa467091c;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=2189b1c8ad22be3320ae8eb04ce83611420f2805;hpb=a69a7d1dd17065764cec9a0d36ea7626d7945d04;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 2189b1c8a..2eebb1ed0 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -18,7 +18,7 @@ #include "bancache.h" /* add a client connection to the sockets list */ -void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) +void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { /* NOTE: Calling this one parameter constructor for User automatically * allocates a new UUID and places it in the hash_map. @@ -26,12 +26,12 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi User* New = NULL; try { - New = new User(Instance); + New = new User(); } catch (...) { - Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); - Instance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!"); + ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!"); return; } @@ -40,13 +40,13 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi memcpy(&New->server_sa, server, sizeof(irc::sockets::sockaddrs)); /* Give each of the modules an attempt to hook the user for I/O */ - FOREACH_MOD_I(Instance, I_OnHookIO, OnHookIO(New, via)); + FOREACH_MOD(I_OnHookIO, OnHookIO(New, via)); if (New->GetIOHook()) { try { - New->GetIOHook()->OnRawSocketAccept(socket, client, server); + New->GetIOHook()->OnStreamSocketAccept(New, client, server); } catch (CoreException& modexcept) { @@ -54,7 +54,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi } } - Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket); + ServerInstance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket); this->unregistered_count++; @@ -63,19 +63,19 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi /* The users default nick is their UUID */ New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax); - New->server = Instance->FindServerNamePtr(Instance->Config->ServerName); + New->server = ServerInstance->Config->ServerName; New->ident.assign("unknown"); New->registered = REG_NONE; - New->signon = Instance->Time() + Instance->Config->dns_timeout; + New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout; New->lastping = 1; /* Smarter than your average bear^H^H^H^Hset of strlcpys. */ New->dhost.assign(New->GetIPString(), 0, 64); New->host.assign(New->GetIPString(), 0, 64); - Instance->Users->AddLocalClone(New); - Instance->Users->AddGlobalClone(New); + ServerInstance->Users->AddLocalClone(New); + ServerInstance->Users->AddGlobalClone(New); /* * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved. @@ -97,9 +97,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi this->local_users.push_back(New); - if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds())) + if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds())) { - Instance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); + ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit); this->QuitUser(New,"No more connections allowed"); return; } @@ -109,29 +109,29 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi * besides that, if we get a positive bancache hit, we still won't fuck * them over if they are exempt. -- w00t */ - New->exempt = (Instance->XLines->MatchesLine("E",New) != NULL); + New->exempt = (ServerInstance->XLines->MatchesLine("E",New) != NULL); - if (BanCacheHit *b = Instance->BanCache->GetHit(New->GetIPString())) + if (BanCacheHit *b = ServerInstance->BanCache->GetHit(New->GetIPString())) { if (!b->Type.empty() && !New->exempt) { /* user banned */ - Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString()); - if (*Instance->Config->MoronBanner) - New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner); + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString()); + if (!ServerInstance->Config->MoronBanner.empty()) + New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str()); this->QuitUser(New, b->Reason); return; } else { - Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString()); + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString()); } } else { if (!New->exempt) { - XLine* r = Instance->XLines->MatchesLine("Z",New); + XLine* r = ServerInstance->XLines->MatchesLine("Z",New); if (r) { @@ -141,9 +141,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi } } - if (!Instance->SE->AddFd(New)) + if (!ServerInstance->SE->AddFd(New, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE)) { - Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection"); + ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection"); this->QuitUser(New, "Internal error handling connection"); } @@ -152,7 +152,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi */ New->WriteServ("NOTICE Auth :*** Looking up your hostname..."); - if (Instance->Config->NoUserDns) + if (ServerInstance->Config->NoUserDns) { New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str()); New->dns_done = true; @@ -171,13 +171,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char return; } - if (IS_FAKE(user)) - { - ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str()); - return; - } - - if (IS_FAKE(user)) + if (IS_SERVER(user)) { ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str()); return; @@ -185,7 +179,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char user->quitting = true; - ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str()); + ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str()); user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str()); std::string reason; @@ -200,16 +194,11 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char if (user->registered == REG_ALL) { - FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(user, reason, oper_reason)); - user->PurgeEmptyChannels(); + FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason)); user->WriteCommonQuit(reason, oper_reason); } - FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(user)); - - user->UpdateNickHash(user->uuid.c_str()); - - user_hash::iterator iter = this->clientlist->find(user->uuid); + FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user)); if (user->registered != REG_ALL) if (ServerInstance->Users->unregistered_count) @@ -217,14 +206,12 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char if (IS_LOCAL(user)) { - if (!user->sendq.empty()) - user->FlushWriteBuf(); - + user->DoWrite(); if (user->GetIOHook()) { try { - user->GetIOHook()->OnRawSocketClose(user->GetFd()); + user->GetIOHook()->OnStreamSocketClose(user); } catch (CoreException& modexcept) { @@ -233,7 +220,9 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char } ServerInstance->SE->DelFd(user); - user->CloseSocket(); + user->Close(); + // user->Close() will set fd to -1; this breaks IS_LOCAL. Fix + user->SetFd(INT_MAX); } /* @@ -255,25 +244,18 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit)) { ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", - user->server, user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str()); + user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str()); } } user->AddToWhoWas(); } + user_hash::iterator iter = this->clientlist->find(user->nick); + if (iter != this->clientlist->end()) this->clientlist->erase(iter); else ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic.."); - - if (IS_LOCAL(user)) - { - std::vector::iterator x = find(local_users.begin(),local_users.end(),user); - if (x != local_users.end()) - local_users.erase(x); - else - ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector"); - } } @@ -439,7 +421,7 @@ void UserManager::ServerNoticeAll(const char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName, textbuffer); + snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -460,7 +442,7 @@ void UserManager::ServerPrivmsgAll(const char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer); + snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -534,7 +516,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...) /* return how many users have a given mode e.g. 'a' */ int UserManager::ModeCount(const char mode) { - ModeHandler* mh = this->ServerInstance->Modes->FindMode(mode, MODETYPE_USER); + ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_USER); if (mh) return mh->GetCount();