ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert UserType to be a uint8_t and move inside User.

Browse Source
This commit is contained in:
Sadie Powell 2020-11-10 18:38:59 +00:00
parent 36a0f48150
commit 8240a06ed3
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/users.h
View File

@ -64,12 +64,6 @@ enum RegistrationState {
REG_ALL = 7 /* REG_NICKUSER plus next bit along */
};
enum UserType {
USERTYPE_LOCAL = 1,
USERTYPE_REMOTE = 2,
USERTYPE_SERVER = 3
};
/** Holds information relevant to <connect allow> and <connect deny> tags in the config file.
*/
struct CoreExport ConnectClass
@ -290,6 +284,19 @@ class CoreExport User : public Extensible
virtual void Execute(LocalUser* user) = 0;
};
/** An enumeration of all possible types of user. */
enum Type : uint8_t
{
/** The user is connected to the local server. */
TYPE_LOCAL = 0,
/** The user is connected to a remote server. */
TYPE_REMOTE = 1,
/** The user is a server pseudo-user. */
TYPE_SERVER = 2,
};
/** List of Memberships for this user
*/
typedef insp::intrusive_list<Membership> ChanList;
@ -367,7 +374,7 @@ class CoreExport User : public Extensible
unsigned int quitting:1;
/** What type of user is this? */
const unsigned int usertype:2;
const uint8_t usertype:2;
/** Get client IP string from sockaddr, using static internal buffer
* @return The IP string
@ -402,7 +409,7 @@ class CoreExport User : public Extensible
/** Constructor
* @throw CoreException if the UID allocated to the user already exists
*/
User(const std::string& uid, Server* srv, UserType objtype);
User(const std::string& uid, Server* srv, Type objtype);
/** Returns the full displayed host of the user
* This member function returns the hostname of the user as seen by other users
@ -832,7 +839,8 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
class RemoteUser : public User
{
public:
RemoteUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_REMOTE)
RemoteUser(const std::string& uid, Server* srv)
: User(uid, srv, TYPE_REMOTE)
{
}
};
@ -841,13 +849,13 @@ class CoreExport FakeUser : public User
{
public:
FakeUser(const std::string& uid, Server* srv)
: User(uid, srv, USERTYPE_SERVER)
: User(uid, srv, TYPE_SERVER)
{
nick = srv->GetName();
}
FakeUser(const std::string& uid, const std::string& sname, const std::string& sdesc)
: User(uid, new Server(uid, sname, sdesc), USERTYPE_SERVER)
: User(uid, new Server(uid, sname, sdesc), TYPE_SERVER)
{
nick = sname;
}
@ -861,17 +869,17 @@ class CoreExport FakeUser : public User
/** Is a local user */
inline LocalUser* IS_LOCAL(User* u)
{
return (u != NULL && u->usertype == USERTYPE_LOCAL) ? static_cast<LocalUser*>(u) : NULL;
return (u != nullptr && u->usertype == User::TYPE_LOCAL) ? static_cast<LocalUser*>(u) : nullptr;
}
/** Is a remote user */
inline RemoteUser* IS_REMOTE(User* u)
{
return (u != NULL && u->usertype == USERTYPE_REMOTE) ? static_cast<RemoteUser*>(u) : NULL;
return (u != nullptr && u->usertype == User::TYPE_REMOTE) ? static_cast<RemoteUser*>(u) : nullptr;
}
/** Is a server fakeuser */
inline FakeUser* IS_SERVER(User* u)
{
return (u != NULL && u->usertype == USERTYPE_SERVER) ? static_cast<FakeUser*>(u) : NULL;
return (u != nullptr && u->usertype == User::TYPE_SERVER) ? static_cast<FakeUser*>(u) : nullptr;
}
inline bool User::IsModeSet(const ModeHandler* mh) const

10
src/commands.cpp
View File

@ -78,18 +78,18 @@ CmdResult SplitCommand::Handle(User* user, const Params& parameters)
{
switch (user->usertype)
{
case USERTYPE_LOCAL:
case User::TYPE_LOCAL:
return HandleLocal(static_cast<LocalUser*>(user), parameters);
case USERTYPE_REMOTE:
case User::TYPE_REMOTE:
return HandleRemote(static_cast<RemoteUser*>(user), parameters);
case USERTYPE_SERVER:
case User::TYPE_SERVER:
return HandleServer(static_cast<FakeUser*>(user), parameters);
}
ServerInstance->Logs.Log("COMMAND", LOG_DEFAULT, "Unknown user type %d in command (uuid=%s)!",
user->usertype, user->uuid.c_str());
ServerInstance->Logs.Log("COMMAND", LOG_DEFAULT, "Unknown user type %u in command (uuid=%s)!",
static_cast<unsigned int>(user->usertype), user->uuid.c_str());
return CmdResult::INVALID;
}

8
src/users.cpp
View File

@ -76,7 +76,7 @@ std::string User::GetModeLetters(bool includeparams) const
return ret;
}
User::User(const std::string& uid, Server* srv, UserType type)
User::User(const std::string& uid, Server* srv, Type type)
: age(ServerInstance->Time())
, uuid(uid)
, server(srv)
@ -92,7 +92,7 @@ User::User(const std::string& uid, Server* srv, UserType type)
ServerInstance->Users.all_ulines.push_back(this);
// Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior
if (type != USERTYPE_SERVER)
if (type != User::TYPE_SERVER)
{
if (!ServerInstance->Users.uuidlist.insert(std::make_pair(uuid, this)).second)
throw CoreException("Duplicate UUID in User constructor: " + uuid);
@ -100,7 +100,7 @@ User::User(const std::string& uid, Server* srv, UserType type)
}
LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL)
: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, User::TYPE_LOCAL)
, eh(this)
, quitting_sendq(false)
, lastping(true)
@ -117,7 +117,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
}
LocalUser::LocalUser(int myfd, const std::string& uid, Serializable::Data& data)
: User(uid, ServerInstance->FakeClient->server, USERTYPE_LOCAL)
: User(uid, ServerInstance->FakeClient->server, User::TYPE_LOCAL)
, eh(this)
{
eh.SetFd(myfd);