fix: Fixed window exhaust handling

MidLevel · Sep 10, 2019 · 57b995d · 57b995d
1 parent dcbaea3
commit 57b995d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Ruffles/Channeling/Channels/ReliableChannel.cs b/Ruffles/Channeling/Channels/ReliableChannel.cs
@@ -135,6 +135,19 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out byte h
 
             lock (_lock)
             {
+                PendingOutgoingPacket unsafeOutgoing = _sendSequencer.GetUnsafe(_lastOutboundSequenceNumber + 1, out bool isSafe);
+
+                if (unsafeOutgoing.Alive && !isSafe)
+                {
+                    if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Outgoing packet window is exhausted. Disconnecting");
+
+                    connection.Disconnect(false);
+
+                    dealloc = false;
+                    headerSize = 0;
+                    return null;
+                }
+
                 // Increment the sequence number
                 _lastOutboundSequenceNumber++;
 
@@ -255,6 +268,7 @@ public void InternalUpdate()
                         {
                             // If they don't ack the message, disconnect them
                             connection.Disconnect(false);
+                            return;
                         }
                         else if ((DateTime.Now - _sendSequencer[i].LastSent).TotalMilliseconds > connection.Roundtrip * config.ReliabilityResendRoundtripMultiplier)
                         {

diff --git a/Ruffles/Channeling/Channels/ReliableSequencedChannel.cs b/Ruffles/Channeling/Channels/ReliableSequencedChannel.cs
@@ -149,6 +149,9 @@ public HeapMemory HandlePoll()
                         if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Incoming packet window is exhausted. Disconnecting");
 
                         connection.Disconnect(false);
+
+                        hasMore = false;
+                        return null;
                     }
                     else if (!_receiveSequencer[sequence].Alive)
                     {
@@ -372,6 +375,7 @@ public void InternalUpdate()
                         {
                             // If they don't ack the message, disconnect them
                             connection.Disconnect(false);
+                            return;
                         }
                         else if ((DateTime.Now - _sendSequencer[i].LastSent).TotalMilliseconds > connection.Roundtrip * config.ReliabilityResendRoundtripMultiplier)
                         {

diff --git a/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs b/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs
@@ -314,6 +314,9 @@ public HeapMemory HandlePoll()
                         if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Incoming packet window is exhausted. Disconnecting");
 
                         connection.Disconnect(false);
+
+                        hasMore = false;
+                        return null;
                     }
                     else if (!_receiveSequencer[sequence].Alive)
                     {
@@ -639,7 +642,6 @@ public void InternalUpdate()
                                 {
                                     // If they don't ack the message, disconnect them
                                     connection.Disconnect(false);
-
                                     return;
                                 }
                                 else if ((DateTime.Now - ((PendingOutgoingFragment)_sendSequencer[i].Fragments[j]).LastSent).TotalMilliseconds > connection.Roundtrip * config.ReliabilityResendRoundtripMultiplier)