minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make server disconnect lingering clients

This commit is contained in:
sfan5 2024-01-05 16:27:06 +01:00
parent b2f0a37b18
commit f27f701251
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/clientiface.cpp
View File

@ -38,8 +38,8 @@ const char *ClientInterface::statenames[] = {
"Disconnecting",
"Denied",
"Created",
"AwaitingInit2",
"HelloSent",
"AwaitingInit2",
"InitDone",
"DefinitionsSent",
"Active",
@ -647,8 +647,7 @@ u64 RemoteClient::uptime() const
ClientInterface::ClientInterface(const std::shared_ptr<con::Connection> & con)
:
m_con(con),
m_env(NULL),
m_print_info_timer(0.0f)
m_env(nullptr)
{
}
@ -706,6 +705,34 @@ void ClientInterface::step(float dtime)
m_print_info_timer = 0.0f;
UpdatePlayerList();
}
m_check_linger_timer += dtime;
if (m_check_linger_timer < 1.0f)
return;
m_check_linger_timer = 0;
RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (const auto &it : m_clients) {
auto state = it.second->getState();
if (state >= CS_HelloSent)
continue;
if (it.second->uptime() <= LINGER_TIMEOUT)
continue;
// CS_Created means nobody has even noticed the client is there
// (this is before on_prejoinplayer runs)
// CS_Invalid should not happen
// -> log those as warning, the rest as info
std::ostream &os = state == CS_Created || state == CS_Invalid ?
warningstream : infostream;
try {
Address addr = m_con->GetPeerAddress(it.second->peer_id);
os << "Disconnecting lingering client from "
<< addr.serializeString() << " (state="
<< state2Name(state) << ")" << std::endl;
m_con->DisconnectPeer(it.second->peer_id);
} catch (con::PeerNotFoundException &e) {
}
}
}
void ClientInterface::UpdatePlayerList()

7
src/clientiface.h
View File

@ -181,8 +181,8 @@ enum ClientState
CS_Disconnecting,
CS_Denied,
CS_Created,
CS_AwaitingInit2,
CS_HelloSent,
CS_AwaitingInit2,
CS_InitDone,
CS_DefinitionsSent,
CS_Active,
@ -550,7 +550,10 @@ private:
// Environment
ServerEnvironment *m_env;
float m_print_info_timer;
float m_print_info_timer = 0;
float m_check_linger_timer = 0;
static const char *statenames[];
static constexpr int LINGER_TIMEOUT = 10;
};