Fixed error catching.

Dtronix · Aug 24, 2023 · c915f33 · c915f33
1 parent 13c2e42
commit c915f33
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/src/NexNet/Internals/NexusSession.Receiving.cs b/src/NexNet/Internals/NexusSession.Receiving.cs
@@ -228,13 +228,7 @@ private async ValueTask<ProcessResult> Process(ReadOnlySequence<byte> sequence)
 
                     case MessageType.DuplexPipeWrite:
                     {
-                        var bufferDuplexPipeResult =
-                            await PipeManager.BufferIncomingData(_recMessageHeader.DuplexPipeId, bodySlice);
-                        if (bufferDuplexPipeResult == NexusPipeBufferResult.HighCutoffReached)
-                        {
-                            disconnect = DisconnectReason.NexusPipeHighWaterCutoffReached;
-                        }
-
+                        await PipeManager.BufferIncomingData(_recMessageHeader.DuplexPipeId, bodySlice);
                         break;
                     }
 

diff --git a/src/NexNet/Internals/NexusSession.cs b/src/NexNet/Internals/NexusSession.cs
@@ -262,7 +262,7 @@ private async ValueTask DisconnectCore(DisconnectReason reason, bool sendDisconn
             {
                 _pipeOutput!.Complete();
             }
-            catch (ObjectDisposedException)
+            catch
             {
                 //noop
             }

diff --git a/src/NexNet/Internals/Pipes/NexusPipeBufferResult.cs b/src/NexNet/Internals/Pipes/NexusPipeBufferResult.cs
@@ -4,6 +4,6 @@ internal enum NexusPipeBufferResult : byte
 {
     Success,
     HighWatermarkReached,
-    HighCutoffReached,
+    //HighCutoffReached,
     DataIgnored,
 }
diff --git a/src/NexNet/Messages/DisconnectReason.cs b/src/NexNet/Messages/DisconnectReason.cs
@@ -55,10 +55,10 @@ public enum DisconnectReason : byte
     /// </summary>
     ServerRestarting = MessageType.DisconnectServerRestarting,
 
-    /// <summary>
-    /// The high water cutoff was reached on a duplex pipe.
-    /// </summary>
-    NexusPipeHighWaterCutoffReached = MessageType.DisconnectNexusPipeHighWaterCutoffReached,
+    // <summary>
+    // The high water cutoff was reached on a duplex pipe.
+    // </summary>
+    //NexusPipeHighWaterCutoffReached = MessageType.DisconnectNexusPipeHighWaterCutoffReached,
 
     /// <summary>
     /// The socket was closed while attempting to write.

diff --git a/src/NexNet/Messages/MessageHeaderType.cs b/src/NexNet/Messages/MessageHeaderType.cs
@@ -64,10 +64,10 @@ public enum MessageType : byte
     /// </summary>
     DisconnectServerRestarting = 30,
 
-    /// <summary>
-    /// The high water cutoff was reached on a duplex pipe. No body.
-    /// </summary>
-    DisconnectNexusPipeHighWaterCutoffReached = 31,
+    // <summary>
+    // The high water cutoff was reached on a duplex pipe. No body.
+    // </summary>
+    //DisconnectNexusPipeHighWaterCutoffReached = 31,
 
     /// <summary>
     /// The socket was closed while attempting to write. No body.