* ---------------------------------------------------
*/
-/* $Core: libIRCDusermanager */
+/* $Core */
#include "inspircd.h"
#include "xline.h"
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);
/* 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);
+ New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner);
this->QuitUser(New, b->Reason);
return;
}
if (Instance->Config->NoUserDns)
{
+ New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
New->dns_done = true;
}
else
void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
{
- ServerInstance->Logs->Log("USERS", 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());
+ 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;
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--;
}
}
- clonemap::iterator y = global_clones.find(user->GetIPString());
+ clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
if (y != global_clones.end())
{
y->second--;
}
if (send_to_user)
{
- t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+ t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
}
}
}
if (send_to_user)
{
- t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+ t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
}
}
}