X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=35d455c45b9bd1c5934f72a58564e4ec991f54fd;hb=1913c07c2eda9c946850dfd2ebafa498ed8b2970;hp=59ac3fce9f97727e1e5d7f724b990c4c72c7c82e;hpb=e66e07d53efd2889e5954d30327343482d550a84;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 59ac3fce9..35d455c45 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -11,14 +11,14 @@ * --------------------------------------------------- */ -/* $Core: libIRCDusermanager */ +/* $Core */ #include "inspircd.h" #include "xline.h" #include "bancache.h" /* add a client connection to the sockets list */ -void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip) +void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip) { /* NOTE: Calling this one parameter constructor for User automatically * allocates a new UUID and places it in the hash_map. @@ -63,27 +63,23 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket); - int j = 0; - this->unregistered_count++; (*(this->clientlist))[New->uuid] = New; /* The users default nick is their UUID */ - strlcpy(New->nick, New->uuid, NICKMAX - 1); + New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax); 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->ident.assign("unknown"); New->registered = REG_NONE; New->signon = Instance->Time() + Instance->Config->dns_timeout; New->lastping = 1; /* 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; + New->dhost.assign(New->GetIPString(), 0, 64); + New->host.assign(New->GetIPString(), 0, 64); Instance->Users->AddLocalClone(New); Instance->Users->AddGlobalClone(New); @@ -96,7 +92,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac if (!i) { - User::QuitUser(Instance, New, "Access denied by configuration"); + this->QuitUser(New, "Access denied by configuration"); return; } @@ -108,10 +104,10 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac this->local_users.push_back(New); - if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= Instance->SE->GetMaxFds())) + if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds())) { Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); - User::QuitUser(Instance, New,"No more connections allowed"); + this->QuitUser(New,"No more connections allowed"); return; } @@ -127,7 +123,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac */ if (socket >= Instance->SE->GetMaxFds()) { - User::QuitUser(Instance, New, "Server is full"); + this->QuitUser(New, "Server is full"); return; } @@ -145,8 +141,8 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac /* 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, Instance->Config->MoronBanner); - User::QuitUser(Instance, New, b->Reason); + New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner); + this->QuitUser(New, b->Reason); return; } else @@ -171,7 +167,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac if (!Instance->SE->AddFd(New)) { Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection"); - User::QuitUser(Instance, New, "Internal error handling connection"); + this->QuitUser(New, "Internal error handling connection"); } /* NOTE: even if dns lookups are *off*, we still need to display this. @@ -181,6 +177,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac if (Instance->Config->NoUserDns) { + New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str()); New->dns_done = true; } else @@ -189,27 +186,96 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac } } +void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason) +{ + ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", 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()); + user->quietquit = false; + user->quitmsg = quitreason; + + if (!*operreason) + user->operquitmsg = quitreason; + else + user->operquitmsg = operreason; + + ServerInstance->GlobalCulls.AddItem(user); +} + + void UserManager::AddLocalClone(User *user) { - clonemap::iterator x = local_clones.find(user->GetIPString()); + int range = 32; + clonemap::iterator x; + switch (user->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + range = ServerInstance->Config->c_ipv6_range; + } + break; +#endif + case AF_INET: + { + range = ServerInstance->Config->c_ipv4_range; + } + break; + } + + x = local_clones.find(user->GetCIDRMask(range)); if (x != local_clones.end()) x->second++; else - local_clones[user->GetIPString()] = 1; + local_clones[user->GetCIDRMask(range)] = 1; } void UserManager::AddGlobalClone(User *user) { - clonemap::iterator y = global_clones.find(user->GetIPString()); - if (y != global_clones.end()) - y->second++; + int range = 32; + clonemap::iterator x; + switch (user->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + range = ServerInstance->Config->c_ipv6_range; + } + break; +#endif + case AF_INET: + { + range = ServerInstance->Config->c_ipv4_range; + } + break; + } + + x = global_clones.find(user->GetCIDRMask(range)); + if (x != global_clones.end()) + x->second++; else - global_clones[user->GetIPString()] = 1; + global_clones[user->GetCIDRMask(range)] = 1; } void UserManager::RemoveCloneCounts(User *user) { - clonemap::iterator x = local_clones.find(user->GetIPString()); + int range = 32; + switch (user->GetProtocolFamily()) + { +#ifdef SUPPORT_IP6LINKS + case AF_INET6: + { + range = ServerInstance->Config->c_ipv6_range; + } + break; +#endif + case AF_INET: + { + range = ServerInstance->Config->c_ipv4_range; + } + break; + } + + clonemap::iterator x = local_clones.find(user->GetCIDRMask(range)); if (x != local_clones.end()) { x->second--; @@ -219,7 +285,7 @@ void UserManager::RemoveCloneCounts(User *user) } } - clonemap::iterator y = global_clones.find(user->GetIPString()); + clonemap::iterator y = global_clones.find(user->GetCIDRMask(range)); if (y != global_clones.end()) { y->second--; @@ -360,7 +426,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...) } if (send_to_user) { - t->WriteServ("NOTICE %s :%s", t->nick, textbuffer); + t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer); } } } @@ -382,7 +448,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...) if (send_to_user) { - t->WriteServ("NOTICE %s :%s", t->nick, textbuffer); + t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer); } } }