*/
#include "inspircd.h"
-#include "configreader.h"
-#include "channels.h"
-#include "users.h"
#include <stdarg.h>
#include "socketengine.h"
#include "wildcard.h"
return true;
}
-std::string userrec::ProcessNoticeMasks(const char *sm)
+std::string User::ProcessNoticeMasks(const char *sm)
{
bool adding = true, oldadding = false;
const char *c = sm;
return output;
}
-void userrec::StartDNSLookup()
+void User::StartDNSLookup()
{
try
{
}
}
-UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache) :
- Resolver(Instance, to_resolve, qt, cache), bound_user(user)
-{
- this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
- this->bound_fd = user->GetFd();
-}
-
-void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
-{
- /* We are only interested in the first matching result */
- if (resultnum)
- return;
-
- if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
- {
- this->bound_user->stored_host = result;
- try
- {
- /* Check we didnt time out */
- if (this->bound_user->registered != REG_ALL)
- {
- bool cached;
-#ifdef IPV6
- if (this->bound_user->GetProtocolFamily() == AF_INET6)
- {
- /* IPV6 forward lookup (with possibility of 4in6) */
- const char* ip = this->bound_user->GetIPString();
- bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), cached);
- }
- else
- /* IPV4 lookup (mixed protocol mode) */
-#endif
- /* IPV4 lookup (ipv4 only mode) */
- bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached);
- this->ServerInstance->AddResolver(bound_user->res_forward, cached);
- }
- }
- catch (CoreException& e)
- {
- ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
- }
- }
- else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
- {
- /* Both lookups completed */
- std::string result2("0::ffff:");
- result2.append(result);
- if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2)
- {
- std::string hostname = this->bound_user->stored_host;
- if (hostname.length() < 65)
- {
- /* Check we didnt time out */
- if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done))
- {
- /* Hostnames starting with : are not a good thing (tm) */
- if (*(hostname.c_str()) == ':')
- hostname.insert(0, "0");
-
- this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
- this->bound_user->dns_done = true;
- strlcpy(this->bound_user->dhost, hostname.c_str(),64);
- strlcpy(this->bound_user->host, hostname.c_str(),64);
- /* Invalidate cache */
- this->bound_user->InvalidateCache();
- }
- }
- else
- {
- if (!this->bound_user->dns_done)
- {
- this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString());
- this->bound_user->dns_done = true;
- }
- }
- }
- else
- {
- if (!this->bound_user->dns_done)
- {
- this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString());
- this->bound_user->dns_done = true;
- }
- }
- }
-}
-
-void UserResolver::OnError(ResolverError e, const std::string &errormessage)
-{
- if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
- {
- /* Since dns timeout is implemented outside of the resolver, this was a race condition that could result in this message being sent *after*
- * the user was fully connected. This check fixes that issue - Special */
- if (!this->bound_user->dns_done)
- {
- /* Error message here */
- this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString());
- this->bound_user->dns_done = true;
- }
- }
-}
-
-
-bool userrec::IsNoticeMaskSet(unsigned char sm)
+bool User::IsNoticeMaskSet(unsigned char sm)
{
return (snomasks[sm-65]);
}
-void userrec::SetNoticeMask(unsigned char sm, bool value)
+void User::SetNoticeMask(unsigned char sm, bool value)
{
snomasks[sm-65] = value;
}
-const char* userrec::FormatNoticeMasks()
+const char* User::FormatNoticeMasks()
{
static char data[MAXBUF];
int offset = 0;
-bool userrec::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m)
{
return (modes[m-65]);
}
-void userrec::SetMode(unsigned char m, bool value)
+void User::SetMode(unsigned char m, bool value)
{
modes[m-65] = value;
}
-const char* userrec::FormatModes()
+const char* User::FormatModes()
{
static char data[MAXBUF];
int offset = 0;
return data;
}
-void userrec::DecrementModes()
+void User::DecrementModes()
{
- for (int n = 0; n < 64; n++)
+ ServerInstance->Log(DEBUG,"DecrementModes()");
+ for (unsigned char n = 'A'; n <= 'z'; n++)
{
- if (modes[n])
+ if (modes[n-65])
{
- ModeHandler* mh = ServerInstance->Modes->FindMode(n+65, MODETYPE_USER);
+ ServerInstance->Log(DEBUG,"DecrementModes() found mode %c", n);
+ ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
if (mh)
+ {
+ ServerInstance->Log(DEBUG,"Found handler %c and call ChangeCount", n);
mh->ChangeCount(-1);
+ }
}
}
}
-userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
+User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
{
- // the PROPER way to do it, AVOID bzero at *ALL* costs
- *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
+ *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
reset_due = ServerInstance->Time();
age = ServerInstance->Time(true);
memset(snomasks,0,sizeof(snomasks));
/* Invalidate cache */
operquit = cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+
+ if (uid.empty())
+ strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
+ else
+ strlcpy(uuid, uid.c_str(), UUID_LENGTH);
+
+ ServerInstance->Log(DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+
+ user_hash::iterator finduuid = Instance->uuidlist->find(uuid);
+ if (finduuid == Instance->uuidlist->end())
+ (*Instance->uuidlist)[uuid] = this;
+ else
+ throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
}
-void userrec::RemoveCloneCounts()
+void User::RemoveCloneCounts()
{
clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
if (x != ServerInstance->local_clones.end())
}
}
-userrec::~userrec()
+User::~User()
{
this->InvalidateCache();
this->DecrementModes();
}
#endif
}
+
+ ServerInstance->uuidlist->erase(uuid);
}
-char* userrec::MakeHost()
+char* User::MakeHost()
{
if (this->cached_makehost)
return this->cached_makehost;
return this->cached_makehost;
}
-char* userrec::MakeHostIP()
+char* User::MakeHostIP()
{
if (this->cached_hostip)
return this->cached_hostip;
return this->cached_hostip;
}
-void userrec::CloseSocket()
+void User::CloseSocket()
{
- shutdown(this->fd,2);
- close(this->fd);
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
}
-char* userrec::GetFullHost()
+char* User::GetFullHost()
{
if (this->cached_fullhost)
return this->cached_fullhost;
return this->cached_fullhost;
}
-char* userrec::MakeWildHost()
+char* User::MakeWildHost()
{
static char nresult[MAXBUF];
char* t = nresult;
return nresult;
}
-int userrec::ReadData(void* buffer, size_t size)
+int User::ReadData(void* buffer, size_t size)
{
if (IS_LOCAL(this))
{
}
-char* userrec::GetFullRealHost()
+char* User::GetFullRealHost()
{
if (this->cached_fullrealhost)
return this->cached_fullrealhost;
return this->cached_fullrealhost;
}
-bool userrec::IsInvited(const irc::string &channel)
+bool User::IsInvited(const irc::string &channel)
{
for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
{
return false;
}
-InvitedList* userrec::GetInviteList()
+InvitedList* User::GetInviteList()
{
return &invites;
}
-void userrec::InviteTo(const irc::string &channel)
+void User::InviteTo(const irc::string &channel)
{
invites.push_back(channel);
}
-void userrec::RemoveInvite(const irc::string &channel)
+void User::RemoveInvite(const irc::string &channel)
{
for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
{
}
}
-bool userrec::HasPermission(const std::string &command)
+bool User::HasPermission(const std::string &command)
{
char* mycmd;
char* savept;
* something we can change anyway. Makes sense to just let
* the compiler do that copy for us.
*/
-bool userrec::AddBuffer(std::string a)
+bool User::AddBuffer(std::string a)
{
try
{
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()");
+ ServerInstance->Log(DEBUG,"Exception in User::AddBuffer()");
return false;
}
}
-bool userrec::BufferIsReady()
+bool User::BufferIsReady()
{
return (recvq.find('\n') != std::string::npos);
}
-void userrec::ClearBuffer()
+void User::ClearBuffer()
{
recvq.clear();
}
-std::string userrec::GetBuffer()
+std::string User::GetBuffer()
{
try
{
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()");
+ ServerInstance->Log(DEBUG,"Exception in User::GetBuffer()");
return "";
}
}
-void userrec::AddWriteBuf(const std::string &data)
+void User::AddWriteBuf(const std::string &data)
{
if (*this->GetWriteError())
return;
}
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void userrec::FlushWriteBuf()
+void User::FlushWriteBuf()
{
try
{
if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
{
int old_sendq_length = sendq.length();
-#ifndef WIN32
- int n_sent = write(this->fd, this->sendq.data(), this->sendq.length());
-#else
- int n_sent = send(this->fd, (const char*)this->sendq.data(), this->sendq.length(), 0);
-#endif
+ int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+
if (n_sent == -1)
{
if (errno == EAGAIN)
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()");
+ ServerInstance->Log(DEBUG,"Exception in User::FlushWriteBuf()");
}
if (this->sendq.empty())
}
}
-void userrec::SetWriteError(const std::string &error)
+void User::SetWriteError(const std::string &error)
{
try
{
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()");
+ ServerInstance->Log(DEBUG,"Exception in User::SetWriteError()");
}
}
-const char* userrec::GetWriteError()
+const char* User::GetWriteError()
{
return this->WriteError.c_str();
}
-void userrec::Oper(const std::string &opertype)
+void User::Oper(const std::string &opertype)
{
try
{
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::Oper()");
+ ServerInstance->Log(DEBUG,"Exception in User::Oper()");
}
}
-void userrec::UnOper()
+void User::UnOper()
{
try
{
// unset their oper type (what IS_OPER checks), and remove +o
*this->oper = 0;
this->modes[UM_OPERATOR] = 0;
-
- // remove them from the opers list.
- for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
- {
- if (*a == this)
- {
- ServerInstance->all_opers.erase(a);
- return;
- }
- }
+
+ // remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404
+ ServerInstance->all_opers.remove(this);
}
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()");
+ ServerInstance->Log(DEBUG,"Exception in User::UnOper()");
}
}
-void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason, const char* operreason)
+void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
{
+ user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, operreason);
user->muted = true;
Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason);
}
/* adds or updates an entry in the whowas list */
-void userrec::AddToWhoWas()
+void User::AddToWhoWas()
{
- command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+ Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
if (whowas_command)
{
std::deque<classbase*> params;
}
/* add a client connection to the sockets list */
-void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
+void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
{
- std::string tempnick = ConvToStr(socket) + "-unknown";
- user_hash::iterator iter = Instance->clientlist->find(tempnick);
+ /* NOTE: Calling this one parameter constructor for User automatically
+ * allocates a new UUID and places it in the hash_map.
+ */
+ User* New = NULL;
+ try
+ {
+ New = new User(Instance);
+ }
+ catch (...)
+ {
+ Instance->Log(DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
+ Instance->WriteOpers("*** WARNING *** Duplicate UUID allocated!");
+ return;
+ }
+
+ int j = 0;
+
+ Instance->unregistered_count++;
+
char ipaddr[MAXBUF];
#ifdef IPV6
if (socketfamily == AF_INET6)
else
#endif
inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
- userrec* New;
- int j = 0;
- Instance->unregistered_count++;
-
- /*
- * fix by brain.
- * as these nicknames are 'RFC impossible', we can be sure nobody is going to be
- * using one as a registered connection. As they are per fd, we can also safely assume
- * that we wont have collisions. Therefore, if the nick exists in the list, its only
- * used by a dead socket, erase the iterator so that the new client may reclaim it.
- * this was probably the cause of 'server ignores me when i hammer it with reconnects'
- * issue in earlier alphas/betas
- */
- if (iter != Instance->clientlist->end())
- {
- userrec* goner = iter->second;
- DELETE(goner);
- Instance->clientlist->erase(iter);
- }
+ (*(Instance->clientlist))[New->uuid] = New;
+ New->SetFd(socket);
- New = new userrec(Instance);
- (*(Instance->clientlist))[tempnick] = New;
- New->fd = socket;
- strlcpy(New->nick,tempnick.c_str(),NICKMAX-1);
+ /* The users default nick is their UUID */
+ strlcpy(New->nick, New->uuid, NICKMAX - 1);
New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
/* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
if (!i)
{
- userrec::QuitUser(Instance, New, "Access denied by configuration");
+ User::QuitUser(Instance, New, "Access denied by configuration");
return;
}
/*
- * Check connect class settings and initialise settings into userrec.
+ * Check connect class settings and initialise settings into User.
* This will be done again after DNS resolution. -- w00t
*/
New->CheckClass();
if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
{
Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
- userrec::QuitUser(Instance, New,"No more connections allowed");
+ User::QuitUser(Instance, New,"No more connections allowed");
return;
}
#ifndef WINDOWS
if ((unsigned int)socket >= MAX_DESCRIPTORS)
{
- userrec::QuitUser(Instance, New, "Server is full");
+ User::QuitUser(Instance, New, "Server is full");
return;
}
#endif
if (*Instance->Config->MoronBanner)
New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
- userrec::QuitUser(Instance, New, reason);
+ User::QuitUser(Instance, New, reason);
return;
}
}
- if (socket > -1)
- {
- if (!Instance->SE->AddFd(New))
- {
- userrec::QuitUser(Instance, New, "Internal error handling connection");
- return;
- }
- }
+ if (socket > -1)
+ {
+ if (!Instance->SE->AddFd(New))
+ {
+ User::QuitUser(Instance, New, "Internal error handling connection");
+ }
+ }
/* NOTE: even if dns lookups are *off*, we still need to display this.
* BOPM and other stuff requires it.
New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
}
-unsigned long userrec::GlobalCloneCount()
+unsigned long User::GlobalCloneCount()
{
clonemap::iterator x = ServerInstance->global_clones.find(this->GetIPString());
if (x != ServerInstance->global_clones.end())
return 0;
}
-unsigned long userrec::LocalCloneCount()
+unsigned long User::LocalCloneCount()
{
clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
if (x != ServerInstance->local_clones.end())
/*
* Check class restrictions
*/
-void userrec::CheckClass(const std::string &explicit_class)
+void User::CheckClass(const std::string &explicit_class)
{
ConnectClass* a = this->GetClass(explicit_class);
if ((!a) || (a->GetType() == CC_DENY))
{
- userrec::QuitUser(ServerInstance, this, "Unauthorised connection");
+ User::QuitUser(ServerInstance, this, "Unauthorised connection");
return;
}
else if ((a->GetMaxLocal()) && (this->LocalCloneCount() > a->GetMaxLocal()))
{
- userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
+ User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
return;
}
else if ((a->GetMaxGlobal()) && (this->GlobalCloneCount() > a->GetMaxGlobal()))
{
- userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
+ User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
return;
}
this->MaxChans = a->GetMaxChans();
}
-void userrec::FullConnect()
+void User::FullConnect()
{
ServerInstance->stats->statsConnects++;
this->idle_lastmsg = ServerInstance->Time();
/*
- * You may be thinking "wtf, we checked this in userrec::AddClient!" - and yes, we did, BUT.
+ * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
* At the time AddClient is called, we don't have a resolved host, by here we probably do - which
* may put the user into a totally seperate class with different restrictions! so we *must* check again.
* Don't remove this! -- w00t
*/
if ((!this->GetClass()->GetPass().empty()) && (!this->haspassed))
{
- userrec::QuitUser(ServerInstance, this, "Invalid password");
+ User::QuitUser(ServerInstance, this, "Invalid password");
return;
}
if (*ServerInstance->Config->MoronBanner)
this->WriteServ("NOTICE %s :*** %s", this->nick, ServerInstance->Config->MoronBanner);
snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
- userrec::QuitUser(ServerInstance, this, reason);
+ User::QuitUser(ServerInstance, this, reason);
return;
}
if (*ServerInstance->Config->MoronBanner)
this->WriteServ("NOTICE %s :*** %s", this, ServerInstance->Config->MoronBanner);
snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
- userrec::QuitUser(ServerInstance, this, reason);
+ User::QuitUser(ServerInstance, this, reason);
return;
}
}
ServerInstance->Config->Send005(this);
+ this->WriteServ("042 %s %s :your unique ID", this->nick, this->uuid);
+
+
this->ShowMOTD();
/* Now registered */
ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
}
-/** userrec::UpdateNick()
+/** User::UpdateNick()
* re-allocates a nick in the user_hash after they change nicknames,
* returns a pointer to the new user as it may have moved
*/
-userrec* userrec::UpdateNickHash(const char* New)
+User* User::UpdateNickHash(const char* New)
{
try
{
if (oldnick == ServerInstance->clientlist->end())
return NULL; /* doesnt exist */
- userrec* olduser = oldnick->second;
+ User* olduser = oldnick->second;
(*(ServerInstance->clientlist))[New] = olduser;
ServerInstance->clientlist->erase(oldnick);
return olduser;
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()");
+ ServerInstance->Log(DEBUG,"Exception in User::UpdateNickHash()");
return NULL;
}
}
-void userrec::InvalidateCache()
+void User::InvalidateCache()
{
/* Invalidate cache */
if (cached_fullhost)
cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
}
-bool userrec::ForceNickChange(const char* newnick)
+bool User::ForceNickChange(const char* newnick)
{
try
{
if (this->registered == REG_ALL)
{
- return (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+ std::deque<classbase*> dummy;
+ Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+ if (nickhandler)
+ {
+ nickhandler->HandleInternal(1, dummy);
+ bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+ nickhandler->HandleInternal(0, dummy);
+ return result;
+ }
}
return false;
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()");
+ ServerInstance->Log(DEBUG,"Exception in User::ForceNickChange()");
return false;
}
}
-void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
+void User::SetSockAddr(int protocol_family, const char* ip, int port)
{
switch (protocol_family)
{
}
}
-int userrec::GetPort()
+int User::GetPort()
{
if (this->ip == NULL)
return 0;
return 0;
}
-int userrec::GetProtocolFamily()
+int User::GetProtocolFamily()
{
if (this->ip == NULL)
return 0;
return sin->sin_family;
}
-const char* userrec::GetIPString()
+const char* User::GetIPString()
{
static char buf[1024];
return "";
}
-const char* userrec::GetIPString(char* buf)
+const char* User::GetIPString(char* buf)
{
if (this->ip == NULL)
{
* something we can change anyway. Makes sense to just let
* the compiler do that copy for us.
*/
-void userrec::Write(std::string text)
+void User::Write(std::string text)
{
if (!ServerInstance->SE->BoundsCheckFd(this))
return;
try
{
- /* ServerInstance->Log(DEBUG,"C[%d] <- %s", this->GetFd(), text.c_str());
+ /* ServerInstance->Log(DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
* WARNING: The above debug line is VERY loud, do NOT
* enable it till we have a good way of filtering it
* out of the logs (e.g. 1.2 would be good).
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+ ServerInstance->Log(DEBUG,"Exception in User::Write() std::string::append");
return;
}
/** Write()
*/
-void userrec::Write(const char *text, ...)
+void User::Write(const char *text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
this->Write(std::string(textbuffer));
}
-void userrec::WriteServ(const std::string& text)
+void User::WriteServ(const std::string& text)
{
char textbuffer[MAXBUF];
/** WriteServ()
* Same as Write(), except `text' is prefixed with `:server.name '.
*/
-void userrec::WriteServ(const char* text, ...)
+void User::WriteServ(const char* text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
}
-void userrec::WriteFrom(userrec *user, const std::string &text)
+void User::WriteFrom(User *user, const std::string &text)
{
char tb[MAXBUF];
/* write text from an originating user to originating user */
-void userrec::WriteFrom(userrec *user, const char* text, ...)
+void User::WriteFrom(User *user, const char* text, ...)
{
va_list argsPtr;
char textbuffer[MAXBUF];
/* write text to an destination user from a source user (e.g. user privmsg) */
-void userrec::WriteTo(userrec *dest, const char *data, ...)
+void User::WriteTo(User *dest, const char *data, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteTo(dest, std::string(textbuffer));
}
-void userrec::WriteTo(userrec *dest, const std::string &data)
+void User::WriteTo(User *dest, const std::string &data)
{
dest->WriteFrom(this, data);
}
-void userrec::WriteCommon(const char* text, ...)
+void User::WriteCommon(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteCommon(std::string(textbuffer));
}
-void userrec::WriteCommon(const std::string &text)
+void User::WriteCommon(const std::string &text)
{
try
{
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()");
+ ServerInstance->Log(DEBUG,"Exception in User::WriteCommon()");
}
}
* channel, NOT including the source user e.g. for use in QUIT
*/
-void userrec::WriteCommonExcept(const char* text, ...)
+void User::WriteCommonExcept(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteCommonExcept(std::string(textbuffer));
}
-void userrec::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
+void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
{
char tb1[MAXBUF];
char tb2[MAXBUF];
}
}
-void userrec::WriteCommonExcept(const std::string &text)
+void User::WriteCommonExcept(const std::string &text)
{
char tb1[MAXBUF];
std::string out1;
}
-void userrec::WriteWallOps(const std::string &text)
+void User::WriteWallOps(const std::string &text)
{
if (!IS_OPER(this) && IS_LOCAL(this))
return;
std::string wallop("WALLOPS :");
wallop.append(text);
- for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
{
- userrec* t = *i;
+ User* t = *i;
if (t->IsModeSet('w'))
this->WriteTo(t,wallop);
}
}
-void userrec::WriteWallOps(const char* text, ...)
+void User::WriteWallOps(const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
* the first users channels then the second users channels within the outer loop,
* therefore it was a maximum of x*y iterations (upon returning 0 and checking
* all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * channel's userlist in the inner loop which is a std::map<User*,User*>
* and saves us time as we already know what pointer value we are after.
* Don't quote me on the maths as i am not a mathematician or computer scientist,
* but i believe this algorithm is now x+(log y) maximum iterations instead.
*/
-bool userrec::SharesChannelWith(userrec *other)
+bool User::SharesChannelWith(User *other)
{
if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
return false;
return false;
}
-bool userrec::ChangeName(const char* gecos)
+bool User::ChangeName(const char* gecos)
{
if (!strcmp(gecos, this->fullname))
return true;
return true;
}
-bool userrec::ChangeDisplayedHost(const char* host)
+bool User::ChangeDisplayedHost(const char* host)
{
if (!strcmp(host, this->dhost))
return true;
if (this->ServerInstance->Config->CycleHosts)
this->WriteCommonExcept("QUIT :Changing hosts");
- /* Fix by Om: userrec::dhost is 65 long, this was truncating some long hosts */
+ /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
strlcpy(this->dhost,host,64);
this->InvalidateCache();
return true;
}
-bool userrec::ChangeIdent(const char* newident)
+bool User::ChangeIdent(const char* newident)
{
if (!strcmp(newident, this->ident))
return true;
return true;
}
-void userrec::SendAll(const char* command, char* text, ...)
+void User::SendAll(const char* command, char* text, ...)
{
char textbuffer[MAXBUF];
char formatbuffer[MAXBUF];
snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
std::string fmt = formatbuffer;
- for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
{
(*i)->Write(fmt);
}
}
-std::string userrec::ChannelList(userrec* source)
+std::string User::ChannelList(User* source)
{
try
{
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()");
+ ServerInstance->Log(DEBUG,"Exception in User::ChannelList()");
return "";
}
}
-void userrec::SplitChanList(userrec* dest, const std::string &cl)
+void User::SplitChanList(User* dest, const std::string &cl)
{
std::string line;
std::ostringstream prefix;
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()");
+ ServerInstance->Log(DEBUG,"Exception in User::SplitChanList()");
}
}
-unsigned int userrec::GetMaxChans()
+unsigned int User::GetMaxChans()
{
return this->MaxChans;
}
* then their ip will be taken as 'priority' anyway, so for example,
* <connect allow="127.0.0.1"> will match joe!bloggs@localhost
*/
-ConnectClass* userrec::GetClass(const std::string &explicit_name)
+ConnectClass* User::GetClass(const std::string &explicit_name)
{
if (!explicit_name.empty())
{
return NULL;
}
-void userrec::PurgeEmptyChannels()
+void User::PurgeEmptyChannels()
{
- std::vector<chanrec*> to_delete;
+ std::vector<Channel*> to_delete;
// firstly decrement the count on each channel
for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()");
+ ServerInstance->Log(DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
}
}
}
- for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+ for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
{
- chanrec* thischan = *n;
+ Channel* thischan = *n;
chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
if (i2 != ServerInstance->chanlist->end())
{
this->UnOper();
}
-void userrec::ShowMOTD()
+void User::ShowMOTD()
{
if (!ServerInstance->Config->MOTD.size())
{
this->WriteServ("376 %s :End of message of the day.", this->nick);
}
-void userrec::ShowRULES()
+void User::ShowRULES()
{
if (!ServerInstance->Config->RULES.size())
{
this->WriteServ("309 %s :End of RULES command.",this->nick);
}
-void userrec::HandleEvent(EventType et, int errornum)
+void User::HandleEvent(EventType et, int errornum)
{
/* WARNING: May delete this user! */
int thisfd = this->GetFd();
}
catch (...)
{
- ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted");
+ ServerInstance->Log(DEBUG,"Exception in User::HandleEvent intercepted");
}
/* If the user has raised an error whilst being processed, quit them now we're safe to */
{
if (!WriteError.empty())
{
- userrec::QuitUser(ServerInstance, this, GetWriteError());
+ User::QuitUser(ServerInstance, this, GetWriteError());
}
}
}
-void userrec::SetOperQuit(const std::string &oquit)
+void User::SetOperQuit(const std::string &oquit)
{
if (operquit)
return;
operquit = strdup(oquit.c_str());
}
-const char* userrec::GetOperQuit()
+const char* User::GetOperQuit()
{
return operquit ? operquit : "";
}
{
}
-bool VisData::VisibleTo(userrec* user)
+bool VisData::VisibleTo(User* user)
{
return true;
}
projects / user / henk / code / inspircd.git / blobdiff