NetSharp

commit 7abf6d358e9a841ed4fd30d26a506453ccf2784b
parent 30665ab0d54b193efeb6032d78cde0a7ebfa751f
Author: Mikolaj Lenczewski <mikolaj.lenczewski308@gmail.com>
Date:   Thu, 11 Jun 2020 18:48:52 +0100

Fixed issues from codefactor.io

Diffstat:
M
NetSharp/NetSharp/Raw/Stream/RawStreamNetworkReader.cs
 | 
156
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
NetSharp/NetSharpExamples/Program.cs
 | 
2
+-

2 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/NetSharp/NetSharp/Raw/Stream/RawStreamNetworkReader.cs b/NetSharp/NetSharp/Raw/Stream/RawStreamNetworkReader.cs
@@ -70,107 +70,107 @@ namespace NetSharp.Raw.Stream
         {
             PacketReadToken readToken = (PacketReadToken) args.UserToken;
 
-            void CompleteReceiveHeader(SocketAsyncEventArgs args, in PacketReadToken readToken)
-            {
-                Memory<byte> headerBuffer = args.Buffer;
-
-                int receivedBytes = args.BytesTransferred,
-                    previousReceivedBytes = args.Offset,
-                    totalReceivedBytes = previousReceivedBytes + receivedBytes,
-                    expectedBytes = readToken.BytesToTransfer;
+            bool receivingHeader = readToken.BytesToTransfer == RawStreamPacketHeader.TotalSize;
 
-                if (totalReceivedBytes == expectedBytes)  // transmission complete
-                {
-                    RawStreamPacketHeader header = RawStreamPacketHeader.Deserialise(in headerBuffer);
+            switch (args.SocketError)
+            {
+                case SocketError.Success:
+                    switch (receivingHeader)
+                    {
+                        case true:
+                            CompleteReceiveHeader(args, in readToken);
+                            break;
 
-                    ConfigureAsyncReceiveData(args, in header);
-                    StartReceive(args);
-                }
-                else if (0 < totalReceivedBytes && totalReceivedBytes < expectedBytes)  // transmission not complete
-                {
-                    args.SetBuffer(totalReceivedBytes, expectedBytes - totalReceivedBytes);
+                        case false:
+                            CompleteReceiveData(args, in readToken);
+                            break;
+                    }
+                    break;
 
-                    ContinueReceive(args);
-                }
-                else if (receivedBytes == 0)  // connection is dead
-                {
+                default:
                     CloseClientConnection(args);
-                }
+                    break;
             }
+        }
 
-            void CompleteReceiveData(SocketAsyncEventArgs args, in PacketReadToken readToken)
-            {
-                Memory<byte> dataBuffer = args.Buffer;
+        private void CompleteReceiveData(SocketAsyncEventArgs args, in PacketReadToken readToken)
+        {
+            Memory<byte> dataBuffer = args.Buffer;
 
-                int receivedBytes = args.BytesTransferred,
-                    previousReceivedBytes = args.Offset,
-                    totalReceivedBytes = previousReceivedBytes + receivedBytes,
-                    expectedBytes = readToken.BytesToTransfer;
+            int receivedBytes = args.BytesTransferred,
+                previousReceivedBytes = args.Offset,
+                totalReceivedBytes = previousReceivedBytes + receivedBytes,
+                expectedBytes = readToken.BytesToTransfer;
 
-                if (totalReceivedBytes == expectedBytes)  // transmission complete
-                {
-                    EndPoint clientEndPoint = args.AcceptSocket.RemoteEndPoint;
+            if (totalReceivedBytes == expectedBytes)  // transmission complete
+            {
+                EndPoint clientEndPoint = args.AcceptSocket.RemoteEndPoint;
 
-                    // TODO use user-supplied delegate to generate response packet header
-                    RawStreamPacketHeader responseHeader = new RawStreamPacketHeader(expectedBytes);
-                    int responseBufferSize = RawStreamPacket.TotalPacketSize(in responseHeader);
+                // TODO use user-supplied delegate to generate response packet header
+                RawStreamPacketHeader responseHeader = new RawStreamPacketHeader(expectedBytes);
+                int responseBufferSize = RawStreamPacket.TotalPacketSize(in responseHeader);
 
-                    byte[] responseBuffer = BufferPool.Rent(responseBufferSize);
+                byte[] responseBuffer = BufferPool.Rent(responseBufferSize);
 
-                    Memory<byte> responseBufferMemory = responseBuffer.AsMemory(RawStreamPacketHeader.TotalSize, responseHeader.DataSize);
+                Memory<byte> responseBufferMemory = responseBuffer.AsMemory(RawStreamPacketHeader.TotalSize, responseHeader.DataSize);
 
-                    // TODO rework request handler
-                    bool responseExists = RequestHandler(clientEndPoint, dataBuffer, totalReceivedBytes, responseBufferMemory);
+                // TODO rework request handler
+                bool responseExists = RequestHandler(clientEndPoint, dataBuffer, totalReceivedBytes, responseBufferMemory);
 
-                    switch (responseExists)
-                    {
-                        case true:
-                            ConfigureAsyncSendPacket(args, ref responseBuffer, in responseHeader, responseBufferMemory);
-                            StartSend(args);
-                            break;
+                switch (responseExists)
+                {
+                    case true:
+                        ConfigureAsyncSendPacket(args, ref responseBuffer, in responseHeader, responseBufferMemory);
+                        StartSend(args);
+                        break;
 
-                        case false:
-                            // we manually returns the response buffer, as it wasnt set to be the args.Buffer, and since we dont have a response
-                            // packet we can reuse it as a packet header buffer in the below ConfigureReceiveHeader() call
-                            BufferPool.Return(responseBuffer, true);
+                    case false:
+                        // we manually returns the response buffer, as it wasnt set to be the args.Buffer, and since we dont have a response packet we
+                        // can reuse it as a packet header buffer in the below ConfigureReceiveHeader() call
+                        BufferPool.Return(responseBuffer, true);
 
-                            ConfigureAsyncReceiveHeader(args);
-                            StartReceive(args);
-                            break;
-                    }
+                        ConfigureAsyncReceiveHeader(args);
+                        StartReceive(args);
+                        break;
                 }
-                else if (0 < totalReceivedBytes && totalReceivedBytes < expectedBytes)  // transmission not complete
-                {
-                    args.SetBuffer(totalReceivedBytes, expectedBytes - totalReceivedBytes);
+            }
+            else if (0 < totalReceivedBytes && totalReceivedBytes < expectedBytes)  // transmission not complete
+            {
+                args.SetBuffer(totalReceivedBytes, expectedBytes - totalReceivedBytes);
 
-                    ContinueReceive(args);
-                }
-                else if (receivedBytes == 0)  // connection is dead
-                {
-                    CloseClientConnection(args);
-                }
+                ContinueReceive(args);
             }
+            else if (receivedBytes == 0)  // connection is dead
+            {
+                CloseClientConnection(args);
+            }
+        }
 
-            bool receivingHeader = readToken.BytesToTransfer == RawStreamPacketHeader.TotalSize;
+        private void CompleteReceiveHeader(SocketAsyncEventArgs args, in PacketReadToken readToken)
+        {
+            Memory<byte> headerBuffer = args.Buffer;
 
-            switch (args.SocketError)
+            int receivedBytes = args.BytesTransferred,
+                previousReceivedBytes = args.Offset,
+                totalReceivedBytes = previousReceivedBytes + receivedBytes,
+                expectedBytes = readToken.BytesToTransfer;
+
+            if (totalReceivedBytes == expectedBytes)  // transmission complete
             {
-                case SocketError.Success:
-                    switch (receivingHeader)
-                    {
-                        case true:
-                            CompleteReceiveHeader(args, in readToken);
-                            break;
+                RawStreamPacketHeader header = RawStreamPacketHeader.Deserialise(in headerBuffer);
 
-                        case false:
-                            CompleteReceiveData(args, in readToken);
-                            break;
-                    }
-                    break;
+                ConfigureAsyncReceiveData(args, in header);
+                StartReceive(args);
+            }
+            else if (0 < totalReceivedBytes && totalReceivedBytes < expectedBytes)  // transmission not complete
+            {
+                args.SetBuffer(totalReceivedBytes, expectedBytes - totalReceivedBytes);
 
-                default:
-                    CloseClientConnection(args);
-                    break;
+                ContinueReceive(args);
+            }
+            else if (receivedBytes == 0)  // connection is dead
+            {
+                CloseClientConnection(args);
             }
         }
 
diff --git a/NetSharp/NetSharpExamples/Program.cs b/NetSharp/NetSharpExamples/Program.cs
@@ -79,7 +79,7 @@ namespace NetSharpExamples
                     string rawInput = Console.ReadLine();
                     int choice = int.Parse(rawInput ?? "x");
 
-                    if (0 > choice || choice >= Examples.Count)
+                    if (choice < 0 || choice >= Examples.Count)
                     {
                         Console.WriteLine("Option does not exist. Please try again!");
                         continue;