From c915f33f0f2895630f22cefeb4fb0a7fd0801a9f Mon Sep 17 00:00:00 2001 From: DJGosnell Date: Thu, 24 Aug 2023 11:30:45 -0400 Subject: [PATCH] Fixed error catching. --- src/NexNet/Internals/NexusSession.Receiving.cs | 8 +------- src/NexNet/Internals/NexusSession.cs | 2 +- src/NexNet/Internals/Pipes/NexusPipeBufferResult.cs | 2 +- src/NexNet/Messages/DisconnectReason.cs | 8 ++++---- src/NexNet/Messages/MessageHeaderType.cs | 8 ++++---- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/NexNet/Internals/NexusSession.Receiving.cs b/src/NexNet/Internals/NexusSession.Receiving.cs index a29a609c..fe666362 100644 --- a/src/NexNet/Internals/NexusSession.Receiving.cs +++ b/src/NexNet/Internals/NexusSession.Receiving.cs @@ -228,13 +228,7 @@ private async ValueTask Process(ReadOnlySequence 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 index 8eb00fa0..457518df 100644 --- 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 index 809938e0..e6b6c39b 100644 --- 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 index de4ffe53..2c009f07 100644 --- a/src/NexNet/Messages/DisconnectReason.cs +++ b/src/NexNet/Messages/DisconnectReason.cs @@ -55,10 +55,10 @@ public enum DisconnectReason : byte /// ServerRestarting = MessageType.DisconnectServerRestarting, - /// - /// The high water cutoff was reached on a duplex pipe. - /// - NexusPipeHighWaterCutoffReached = MessageType.DisconnectNexusPipeHighWaterCutoffReached, + // + // The high water cutoff was reached on a duplex pipe. + // + //NexusPipeHighWaterCutoffReached = MessageType.DisconnectNexusPipeHighWaterCutoffReached, /// /// The socket was closed while attempting to write. diff --git a/src/NexNet/Messages/MessageHeaderType.cs b/src/NexNet/Messages/MessageHeaderType.cs index c2a7393f..f0719fb0 100644 --- a/src/NexNet/Messages/MessageHeaderType.cs +++ b/src/NexNet/Messages/MessageHeaderType.cs @@ -64,10 +64,10 @@ public enum MessageType : byte /// DisconnectServerRestarting = 30, - /// - /// The high water cutoff was reached on a duplex pipe. No body. - /// - DisconnectNexusPipeHighWaterCutoffReached = 31, + // + // The high water cutoff was reached on a duplex pipe. No body. + // + //DisconnectNexusPipeHighWaterCutoffReached = 31, /// /// The socket was closed while attempting to write. No body.