* ---------------------------------------------------
*/
-/* $Core */
-
#include "inspircd.h"
#include "xline.h"
#include "bancache.h"
/* add a client connection to the sockets list */
-void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+void UserManager::AddUser(int socket, ListenSocket* 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.
*/
- User* New = NULL;
+ LocalUser* New = NULL;
try
{
- New = new User();
+ New = new LocalUser(socket, client, server);
}
catch (...)
{
return;
}
- New->SetFd(socket);
- memcpy(&New->client_sa, client, sizeof(irc::sockets::sockaddrs));
- 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_OnHookIO, OnHookIO(New, via));
this->unregistered_count++;
- (*(this->clientlist))[New->uuid] = New;
-
/* The users default nick is their UUID */
New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
+ (*(this->clientlist))[New->nick] = New;
- New->server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
New->ident.assign("unknown");
New->registered = REG_NONE;
* 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->SetClass();
-
- if (!i)
- {
- this->QuitUser(New, "Access denied by configuration");
- return;
- }
+ New->SetClass();
/*
* Check connect class settings and initialise settings into User.
{
/* user banned */
ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
- if (*ServerInstance->Config->MoronBanner)
- New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner);
+ 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;
}
user->WriteCommonQuit(reason, oper_reason);
}
- FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
-
if (user->registered != REG_ALL)
if (ServerInstance->Users->unregistered_count)
ServerInstance->Users->unregistered_count--;
if (IS_LOCAL(user))
{
- user->DoWrite();
- if (user->GetIOHook())
+ LocalUser* lu = IS_LOCAL(user);
+ FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+ lu->DoWrite();
+ if (lu->GetIOHook())
{
try
{
- user->GetIOHook()->OnStreamSocketClose(user);
+ lu->GetIOHook()->OnStreamSocketClose(lu);
}
catch (CoreException& modexcept)
{
}
}
- ServerInstance->SE->DelFd(user);
- user->Close();
- // user->Close() will set fd to -1; this breaks IS_LOCAL. Fix
- user->SetFd(INT_MAX);
+ ServerInstance->SE->DelFd(lu);
+ lu->Close();
}
/*
void UserManager::AddLocalClone(User *user)
{
- int range = 32;
clonemap::iterator x;
- switch (user->client_sa.sa.sa_family)
- {
- case AF_INET6:
- range = ServerInstance->Config->c_ipv6_range;
- break;
- case AF_INET:
- range = ServerInstance->Config->c_ipv4_range;
- break;
- }
-
- x = local_clones.find(user->GetCIDRMask(range));
+ x = local_clones.find(user->GetCIDRMask());
if (x != local_clones.end())
x->second++;
else
- local_clones[user->GetCIDRMask(range)] = 1;
+ local_clones[user->GetCIDRMask()] = 1;
}
void UserManager::AddGlobalClone(User *user)
{
- int range = 32;
clonemap::iterator x;
- switch (user->client_sa.sa.sa_family)
- {
- case AF_INET6:
- range = ServerInstance->Config->c_ipv6_range;
- break;
- case AF_INET:
- range = ServerInstance->Config->c_ipv4_range;
- break;
- }
- x = global_clones.find(user->GetCIDRMask(range));
+ x = global_clones.find(user->GetCIDRMask());
if (x != global_clones.end())
x->second++;
else
- global_clones[user->GetCIDRMask(range)] = 1;
+ global_clones[user->GetCIDRMask()] = 1;
}
void UserManager::RemoveCloneCounts(User *user)
{
- int range = 32;
- switch (user->client_sa.sa.sa_family)
- {
- case AF_INET6:
- range = ServerInstance->Config->c_ipv6_range;
- break;
- case AF_INET:
- range = ServerInstance->Config->c_ipv4_range;
- break;
- }
-
- clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
- if (x != local_clones.end())
+ if (IS_LOCAL(user))
{
- x->second--;
- if (!x->second)
+ clonemap::iterator x = local_clones.find(user->GetCIDRMask());
+ if (x != local_clones.end())
{
- local_clones.erase(x);
+ x->second--;
+ if (!x->second)
+ {
+ local_clones.erase(x);
+ }
}
}
- clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
+ clonemap::iterator y = global_clones.find(user->GetCIDRMask());
if (y != global_clones.end())
{
y->second--;
unsigned long UserManager::GlobalCloneCount(User *user)
{
- int range = 32;
- switch (user->client_sa.sa.sa_family)
- {
- case AF_INET6:
- range = ServerInstance->Config->c_ipv6_range;
- break;
- case AF_INET:
- range = ServerInstance->Config->c_ipv4_range;
- break;
- }
- clonemap::iterator x = global_clones.find(user->GetCIDRMask(range));
+ clonemap::iterator x = global_clones.find(user->GetCIDRMask());
if (x != global_clones.end())
return x->second;
else
unsigned long UserManager::LocalCloneCount(User *user)
{
- int range = 32;
- switch (user->client_sa.sa.sa_family)
- {
- case AF_INET6:
- range = ServerInstance->Config->c_ipv6_range;
- break;
- case AF_INET:
- range = ServerInstance->Config->c_ipv4_range;
- break;
- }
- clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
+ clonemap::iterator x = local_clones.find(user->GetCIDRMask());
if (x != local_clones.end())
return x->second;
else
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<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+ for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
User* t = *i;
t->WriteServ(std::string(formatbuffer));
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<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+ for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
User* t = *i;
t->WriteServ(std::string(formatbuffer));
}
}
-void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
-{
- char textbuffer[MAXBUF];
- int modelen;
- va_list argsPtr;
-
- if (!text || !modes || !flags)
- {
- ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
- return;
- }
-
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- modelen = strlen(modes);
-
- if (flags == WM_AND)
- {
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- bool send_to_user = true;
-
- for (int n = 0; n < modelen; n++)
- {
- if (!t->IsModeSet(modes[n]))
- {
- send_to_user = false;
- break;
- }
- }
- if (send_to_user)
- {
- t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
- }
- }
- }
- else if (flags == WM_OR)
- {
- for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- User* t = *i;
- bool send_to_user = false;
-
- for (int n = 0; n < modelen; n++)
- {
- if (t->IsModeSet(modes[n]))
- {
- send_to_user = true;
- break;
- }
- }
-
- if (send_to_user)
- {
- t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
- }
- }
- }
-}
/* return how many users have a given mode e.g. 'a' */
int UserManager::ModeCount(const char mode)
projects / user / henk / code / inspircd.git / blobdiff