From f3e32b2f6ae727dfb5696d425d7d121c1aa70428 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 1 Feb 2025 08:56:57 +0100 Subject: [PATCH] Codechange: use Pool's counter instead of maintaining our own --- src/network/network_admin.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp index 8ac4a6e72b..f1c6598956 100644 --- a/src/network/network_admin.cpp +++ b/src/network/network_admin.cpp @@ -31,9 +31,6 @@ /** Redirection of the (remote) console to the admin. */ AdminIndex _redirect_console_to_admin = INVALID_ADMIN_ID; -/** The amount of admins connected. */ -uint8_t _network_admins_connected = 0; - /** The pool with sockets/clients. */ NetworkAdminSocketPool _networkadminsocket_pool("NetworkAdminSocket"); INSTANTIATE_POOL_METHODS(NetworkAdminSocket) @@ -67,7 +64,6 @@ static_assert(lengthof(_admin_update_type_frequencies) == ADMIN_UPDATE_END); */ ServerNetworkAdminSocketHandler::ServerNetworkAdminSocketHandler(SOCKET s) : NetworkAdminSocketHandler(s) { - _network_admins_connected++; this->status = ADMIN_STATUS_INACTIVE; this->connect_time = std::chrono::steady_clock::now(); } @@ -77,7 +73,6 @@ ServerNetworkAdminSocketHandler::ServerNetworkAdminSocketHandler(SOCKET s) : Net */ ServerNetworkAdminSocketHandler::~ServerNetworkAdminSocketHandler() { - _network_admins_connected--; Debug(net, 3, "[admin] '{}' ({}) has disconnected", this->admin_name, this->admin_version); if (_redirect_console_to_admin == this->index) _redirect_console_to_admin = INVALID_ADMIN_ID; @@ -93,12 +88,7 @@ ServerNetworkAdminSocketHandler::~ServerNetworkAdminSocketHandler() */ /* static */ bool ServerNetworkAdminSocketHandler::AllowConnection() { - bool accept = _settings_client.network.AdminAuthenticationConfigured() && _network_admins_connected < MAX_ADMINS; - /* We can't go over the MAX_ADMINS limit here. However, if we accept - * the connection, there has to be space in the pool. */ - static_assert(NetworkAdminSocketPool::MAX_SIZE == MAX_ADMINS); - assert(!accept || ServerNetworkAdminSocketHandler::CanAllocateItem()); - return accept; + return _settings_client.network.AdminAuthenticationConfigured() && ServerNetworkAdminSocketHandler::CanAllocateItem(); } /** Send the packets for the server sockets. */