X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=f8b1f0de257cfe4d4b4d53f8c911c810460ac055;hb=96a4a1d41e42dba806c2e9954e148ed838262511;hp=7f07bc69ffcc35c635ab6c2c7a29a6bc086fa588;hpb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 7f07bc69f..f8b1f0de2 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -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::AddUser(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, 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. @@ -37,23 +37,23 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache char ipaddr[MAXBUF]; #ifdef IPV6 - if (socketfamily == AF_INET6) + if (ip->sa_family == 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)); New->SetFd(socket); - New->SetSockAddr(socketfamily, ipaddr, port); + New->SetSockAddr(ip->sa_family, ipaddr, port); /* Give each of the modules an attempt to hook the user for I/O */ FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip)); - if (New->io) + if (New->GetIOHook()) { try { - New->io->OnRawSocketAccept(socket, ipaddr, port); + New->GetIOHook()->OnRawSocketAccept(socket, ipaddr, port); } catch (CoreException& modexcept) { @@ -68,7 +68,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache (*(this->clientlist))[New->uuid] = New; /* The users default nick is their UUID */ - New->nick.assign(New->uuid, 0, NICKMAX - 1); + New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax); New->server = Instance->FindServerNamePtr(Instance->Config->ServerName); New->ident.assign("unknown"); @@ -78,7 +78,8 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache New->lastping = 1; /* Smarter than your average bear^H^H^H^Hset of strlcpys. */ - New->dhost.assign(New->host.assign(New->GetIPString(), 64)); + New->dhost.assign(New->GetIPString(), 0, 64); + New->host.assign(New->GetIPString(), 0, 64); Instance->Users->AddLocalClone(New); Instance->Users->AddGlobalClone(New); @@ -110,22 +111,6 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache 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!) - */ - if (socket >= Instance->SE->GetMaxFds()) - { - this->QuitUser(New, "Server is full"); - return; - } - /* * even with bancache, we still have to keep User::exempt current. * besides that, if we get a positive bancache hit, we still won't fuck @@ -187,8 +172,15 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason) { + if (user->quitting) + { + ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str()); + return; + } + 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->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str()); + user->quitting = true; user->quietquit = false; user->quitmsg = quitreason; @@ -203,25 +195,78 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char 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--; @@ -230,8 +275,8 @@ void UserManager::RemoveCloneCounts(User *user) local_clones.erase(x); } } - - clonemap::iterator y = global_clones.find(user->GetIPString()); + + clonemap::iterator y = global_clones.find(user->GetCIDRMask(range)); if (y != global_clones.end()) { y->second--; @@ -244,7 +289,23 @@ void UserManager::RemoveCloneCounts(User *user) unsigned long UserManager::GlobalCloneCount(User *user) { - clonemap::iterator x = global_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 = global_clones.find(user->GetCIDRMask(range)); if (x != global_clones.end()) return x->second; else @@ -253,7 +314,23 @@ unsigned long UserManager::GlobalCloneCount(User *user) unsigned long UserManager::LocalCloneCount(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()) return x->second; else @@ -410,6 +487,3 @@ int UserManager::ModeCount(const char mode) else return 0; } - - -