oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Time out when reliables can't be delivered

Browse source 
If one of the channels stalls for whatever reason we can't pretend the connection is fine.
This commit is contained in:
sfan5 2024-01-05 12:24:14 +01:00
parent 9f684eac92
commit 3987318f09
3 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/network/connectionthreads.cpp
View file

@ -195,10 +195,11 @@ void ConnectionSendThread::runTimeouts(float dtime)
// Note that this time is also fixed since the timeout is not reset in half-open state.
const float peer_timeout = peer->isHalfOpen() ?
MYMAX(5.0f, m_timeout / 4) : m_timeout;
if (peer->isTimedOut(peer_timeout)) {
std::string reason;
if (peer->isTimedOut(peer_timeout, reason)) {
infostream << m_connection->getDesc()
<< "RunTimeouts(): Peer " << peer->id
<< " has timed out."
<< " has timed out (" << reason << ")"
<< std::endl;
// Add peer to the list
timeouted_peers.push_back(peer->id);
@ -216,7 +217,7 @@ void ConnectionSendThread::runTimeouts(float dtime)
channel.outgoing_reliables_sent.incrementTimeouts(dtime);
// Re-send timed out outgoing reliables
auto timed_outs = channel.outgoing_reliables_sent.getTimedOuts(resend_timeout,
auto timed_outs = channel.outgoing_reliables_sent.getResend(resend_timeout,
(m_max_data_packets_per_iteration / numpeers));
channel.UpdatePacketLossCounter(timed_outs.size());
@ -424,10 +425,10 @@ void ConnectionSendThread::processReliableCommand(ConnectionCommandPtr &c)
return;
Channel &channel = dynamic_cast<UDPPeer *>(&peer)->channels[c->channelnum];
auto timed_outs = channel.outgoing_reliables_sent.getTimedOuts(0, 1);
auto list = channel.outgoing_reliables_sent.getResend(0, 1);
if (!timed_outs.empty())
resendReliable(channel, timed_outs.front().get(), -1);
if (!list.empty())
resendReliable(channel, list.front().get(), -1);
return;
}