BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

ClientInterface: add a function to verify (correctly) if user limit was reached (#6258)

Browse Source 
* 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)
This commit is contained in:
Loïc Blot 2017-08-16 23:48:29 +02:00 committed by GitHub
parent 85511a642f
commit 1d8d01074f
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/clientiface.cpp
View File

@ -622,15 +622,24 @@ std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
std::vector<u16> reply; std::vector<u16> reply;
MutexAutoLock clientslock(m_clients_mutex); MutexAutoLock clientslock(m_clients_mutex);
for (RemoteClientMap::iterator i = m_clients.begin(); for (const auto &m_client : m_clients) {
i != m_clients.end(); ++i) { if (m_client.second->getState() >= min_state)
if (i->second->getState() >= min_state) reply.push_back(m_client.second->peer_id);
reply.push_back(i->second->peer_id);
} }
return reply; return reply;
} }
/**
* Verify if user limit was reached.
* User limit count all clients from HelloSent state (MT protocol user) to Active state
* @return true if user limit was reached
*/
bool ClientInterface::isUserLimitReached()
{
return getClientIDs(CS_HelloSent).size() >= g_settings->getU16("max_users");
}
void ClientInterface::step(float dtime) void ClientInterface::step(float dtime)
{ {
m_print_info_timer += dtime; m_print_info_timer += dtime;

4
src/clientiface.h
View File

@ -427,6 +427,9 @@ public:
/* get list of active client id's */ /* get list of active client id's */
std::vector<u16> getClientIDs(ClientState min_state=CS_Active); std::vector<u16> getClientIDs(ClientState min_state=CS_Active);
/* verify is server user limit was reached */
bool isUserLimitReached();
/* get list of client player names */ /* get list of client player names */
const std::vector<std::string> &getPlayerNames() const { return m_clients_names; } const std::vector<std::string> &getPlayerNames() const { return m_clients_names; }
@ -472,7 +475,6 @@ public:
} }
static std::string state2Name(ClientState state); static std::string state2Name(ClientState state);
protected: protected:
//TODO find way to avoid this functions //TODO find way to avoid this functions
void lock() { m_clients_mutex.lock(); } void lock() { m_clients_mutex.lock(); }

4
src/network/serverpackethandler.cpp
View File

@ -211,7 +211,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
// Enforce user limit. // Enforce user limit.
// Don't enforce for users that have some admin right // 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, "server") &&
!checkPriv(playername, "ban") && !checkPriv(playername, "ban") &&
!checkPriv(playername, "privs") && !checkPriv(playername, "privs") &&
@ -520,7 +520,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
// Enforce user limit. // Enforce user limit.
// Don't enforce for users that have some admin right // 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, "server") &&
!checkPriv(playername, "ban") && !checkPriv(playername, "ban") &&
!checkPriv(playername, "privs") && !checkPriv(playername, "privs") &&