jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: Trigger resends from server in deadlock scenario.

Browse source 
The previous commit fixed the deadlock problem but if playing with older
clients it can still occur. Add a fix for it on the server side too so the
problem is guarded against on both ends.
This commit is contained in:
Simon Howard 2019-01-30 18:42:01 -05:00
parent b8656b5283
commit fea3b29487
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/net_server.c
View file

@ -1681,6 +1681,18 @@ void NET_SV_CheckDeadlock(net_client_t *client)
break; break;
} }
} }
// If we sent a resend request to break the deadlock, also trigger a
// resend of any tics we have sitting in the send queue, in case the
// client is blocked waiting on tics from us that have been lost.
// This fixes deadlock with some older clients which do not send
// resends to break deadlock.
if (i < BACKUPTICS && client->sendseq > client->acknowledged)
{
NET_Log("server: also resending tics %d-%d to break deadlock",
client->acknowledged, client->sendseq - 1);
NET_SV_SendTics(client, client->acknowledged, client->sendseq - 1);
}
} }
} }