shithub: choc

Info  •  Files  •  Log  •  Branches

net: Trigger resends from server in deadlock scenario.

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.

--- a/src/net_server.c

+++ b/src/net_server.c

@@ -1681,6 +1681,18 @@

                 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);

+        }

     }

 }