mirror of
https://github.com/minetest/minetest.git
synced 2024-08-20 13:34:17 +02:00
Make server disconnect lingering clients
This commit is contained in:
parent
b2f0a37b18
commit
f27f701251
@ -38,8 +38,8 @@ const char *ClientInterface::statenames[] = {
|
|||||||
"Disconnecting",
|
"Disconnecting",
|
||||||
"Denied",
|
"Denied",
|
||||||
"Created",
|
"Created",
|
||||||
"AwaitingInit2",
|
|
||||||
"HelloSent",
|
"HelloSent",
|
||||||
|
"AwaitingInit2",
|
||||||
"InitDone",
|
"InitDone",
|
||||||
"DefinitionsSent",
|
"DefinitionsSent",
|
||||||
"Active",
|
"Active",
|
||||||
@ -647,8 +647,7 @@ u64 RemoteClient::uptime() const
|
|||||||
ClientInterface::ClientInterface(const std::shared_ptr<con::Connection> & con)
|
ClientInterface::ClientInterface(const std::shared_ptr<con::Connection> & con)
|
||||||
:
|
:
|
||||||
m_con(con),
|
m_con(con),
|
||||||
m_env(NULL),
|
m_env(nullptr)
|
||||||
m_print_info_timer(0.0f)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -706,6 +705,34 @@ void ClientInterface::step(float dtime)
|
|||||||
m_print_info_timer = 0.0f;
|
m_print_info_timer = 0.0f;
|
||||||
UpdatePlayerList();
|
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()
|
void ClientInterface::UpdatePlayerList()
|
||||||
|
@ -181,8 +181,8 @@ enum ClientState
|
|||||||
CS_Disconnecting,
|
CS_Disconnecting,
|
||||||
CS_Denied,
|
CS_Denied,
|
||||||
CS_Created,
|
CS_Created,
|
||||||
CS_AwaitingInit2,
|
|
||||||
CS_HelloSent,
|
CS_HelloSent,
|
||||||
|
CS_AwaitingInit2,
|
||||||
CS_InitDone,
|
CS_InitDone,
|
||||||
CS_DefinitionsSent,
|
CS_DefinitionsSent,
|
||||||
CS_Active,
|
CS_Active,
|
||||||
@ -550,7 +550,10 @@ private:
|
|||||||
// Environment
|
// Environment
|
||||||
ServerEnvironment *m_env;
|
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 const char *statenames[];
|
||||||
|
|
||||||
|
static constexpr int LINGER_TIMEOUT = 10;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user