fix: disconnecting player if send buffer is full

Full send buffer will throw, This will cause issues when sending to multiple clients if just one of their send buffers is full
MirageNet · Jul 9, 2024 · 3ea2d5d · 3ea2d5d
1 parent d722758
commit 3ea2d5d
Showing 1 changed file with 34 additions and 6 deletions.
diff --git a/Assets/Mirage/Runtime/NetworkPlayer.cs b/Assets/Mirage/Runtime/NetworkPlayer.cs
@@ -203,15 +203,29 @@ public void Send<T>(T message, Channel channelId = Channel.Reliable)
         /// <param name="channelId"></param>
         public void Send(ArraySegment<byte> segment, Channel channelId = Channel.Reliable)
         {
-            if (_isDisconnected) { return; }
+            if (_isDisconnected)
+                return;
 
-            if (channelId == Channel.Reliable)
+            try
             {
-                _connection.SendReliable(segment);
+                if (channelId == Channel.Reliable)
+                {
+                    _connection.SendReliable(segment);
+                }
+                else
+                {
+                    _connection.SendUnreliable(segment);
+                }
             }
-            else
+            catch (BufferFullException e)
             {
-                _connection.SendUnreliable(segment);
+                logger.LogError($"Disconnecting player because send buffer was full. {e}");
+                Disconnect();
+            }
+            catch (NoConnectionException e)
+            {
+                logger.LogError($"Inner connection was disconnected, but disconnected flag not yet. {e}");
+                Disconnect();
             }
         }
 
@@ -233,7 +247,21 @@ public void Send<T>(T message, INotifyCallBack callBacks)
                 var segment = writer.ToArraySegment();
                 NetworkDiagnostics.OnSend(message, segment.Count, 1);
                 if (logger.LogEnabled()) logger.Log($"Sending {typeof(T)} to {this} channel:Notify");
-                _connection.SendNotify(segment, callBacks);
+
+                try
+                {
+                    _connection.SendNotify(segment, callBacks);
+                }
+                catch (BufferFullException e)
+                {
+                    logger.LogError($"Disconnecting player because send buffer was full. {e}");
+                    Disconnect();
+                }
+                catch (NoConnectionException e)
+                {
+                    logger.LogError($"Inner connection was disconnected, but disconnected flag not yet. {e}");
+                    Disconnect();
+                }
             }
         }