diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-16 23:48:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 23:48:29 +0200 |
| commit | 1d8d01074fdb52946f81110bebf1d001185b394b (patch) | |
| tree | 64cbf6f73bc0f18cbf8333247cd71ab1856ed4c2 /src/network | |
| parent | 85511a642f851100d0d856f4ecbe7fea7a7bb049 (diff) | |
| download | minetest-1d8d01074fdb52946f81110bebf1d001185b394b.tar.gz minetest-1d8d01074fdb52946f81110bebf1d001185b394b.tar.bz2 minetest-1d8d01074fdb52946f81110bebf1d001185b394b.zip | |
ClientInterface: add a function to verify (correctly) if user limit was reached (#6258)
* ClientInterface: add a function to verify (correctly) if user limit was reached
CS_HelloSent is a better indicator of active slots than CS_Created, which are session objects created after init packet reception
Switch existing checks to ClientInterface::isUserLimitReached()
Use range-based for loop for getClientIds() used function too
This will fix #6254 (not the memory overhead if init is flooded)
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/serverpackethandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 2151450d2..b0fb17b72 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -211,7 +211,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt) // Enforce user limit. // Don't enforce for users that have some admin right - if (m_clients.getClientIDs(CS_Created).size() >= g_settings->getU16("max_users") && + if (m_clients.isUserLimitReached() && !checkPriv(playername, "server") && !checkPriv(playername, "ban") && !checkPriv(playername, "privs") && @@ -520,7 +520,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt) // Enforce user limit. // Don't enforce for users that have some admin right - if (m_clients.getClientIDs(CS_Created).size() >= g_settings->getU16("max_users") && + if (m_clients.isUserLimitReached() >= g_settings->getU16("max_users") && !checkPriv(playername, "server") && !checkPriv(playername, "ban") && !checkPriv(playername, "privs") && |