diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 15:04:01 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 15:04:01 +0100 |
| commit | 11916574f67962dce1d7a2fdf7ef6a3d2d1fa49f (patch) | |
| tree | 1c3c602de5512a62e2db96652ddd540e6e53e821 /src/users.cpp | |
| parent | 2f181fef775da4a686a892c06af843dddfb7950a (diff) | |
Introduce Server class
- Replaces std::string server in User
- Replaces InspIRCd::ULine() and SilentULine()
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/users.cpp b/src/users.cpp index fa4bb7a42..88ae0faf4 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -69,8 +69,8 @@ const char* User::FormatModes(bool showparameters) return data.c_str(); } -User::User(const std::string &uid, const std::string& sid, int type) - : uuid(uid), server(sid), usertype(type) +User::User(const std::string& uid, Server* srv, int type) + : uuid(uid), server(srv), usertype(type) { age = ServerInstance->Time(); signon = 0; @@ -85,7 +85,7 @@ User::User(const std::string &uid, const std::string& sid, int type) } LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr) - : User(ServerInstance->UIDGen.GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this), + : User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL), eh(this), localuseriter(ServerInstance->Users->local_users.end()), bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0), already_sent(0) @@ -1291,14 +1291,14 @@ const std::string& FakeUser::GetFullHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return server; + return server->GetName(); } const std::string& FakeUser::GetFullRealHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return server; + return server->GetName(); } ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask) |