Changeset 377 for binary-improvements2/SpaceWizards.HttpListener/src/System/Net/WebSockets

Timestamp:

Aug 1, 2022, 12:26:44 PM (3 years ago)

Author:

alloc

Message:

Made SpaceWizards.HttpListener compilable against .NET 4.8 with preprocessor define UNITY_NETFRAMEWORK

Location:

binary-improvements2/SpaceWizards.HttpListener/src/System/Net/WebSockets

Files:

• HttpListenerWebSocketContext.cs (modified) (1 diff)
• HttpWebSocket.cs (modified) (4 diffs)
• WebSocketValidate.cs (modified) (1 diff)

binary-improvements2/SpaceWizards.HttpListener/src/System/Net/WebSockets/HttpListenerWebSocketContext.cs

@@ -1 +1 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
+// ReSharper disable ConditionIsAlwaysTrueOrFalse
+#pragma warning disable CS8601
+#pragma warning disable CS8618
 
 using System;

binary-improvements2/SpaceWizards.HttpListener/src/System/Net/WebSockets/HttpWebSocket.cs

@@ -1 +1 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
+// ReSharper disable UnusedMember.Local
+#pragma warning disable CS0162
+#pragma warning disable CS8602
 
 using System;
@@ -26 +30 @@
 
             // SHA1 used only for hashing purposes, not for crypto. Check here for FIPS compat.
+#if UNITY_NETFRAMEWORK
+            SHA1 sha1 = SHA1.Create();
+            byte[] hash = sha1.ComputeHash(toHash);
+#else
             byte[] hash = SHA1.HashData(toHash);
+#endif
             return Convert.ToBase64String(hash);
         }
 
+#if UNITY_NETFRAMEWORK
+        private static readonly char[] protocolsSplitChars = new []{','};
+#endif
+        
         // return value here signifies if a Sec-WebSocket-Protocol header should be returned by the server.
         internal static bool ProcessWebSocketProtocolHeader(string? clientSecWebSocketProtocol,
@@ -60 +73 @@
             // and the server has specified exactly one protocol
 
+#if UNITY_NETFRAMEWORK
+            string[] requestProtocols = clientSecWebSocketProtocol.Split(protocolsSplitChars, StringSplitOptions.RemoveEmptyEntries);
+#else
             string[] requestProtocols = clientSecWebSocketProtocol.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+#endif
             acceptProtocol = subProtocol;
 
@@ -68 +85 @@
             {
                 string currentRequestProtocol = requestProtocols[i];
+#if UNITY_NETFRAMEWORK
+                currentRequestProtocol = currentRequestProtocol.Trim ();
+                if (currentRequestProtocol.Length == 0) {
+                    continue;
+                }
+#endif
                 if (string.Equals(acceptProtocol, currentRequestProtocol, StringComparison.OrdinalIgnoreCase))
                 {

binary-improvements2/SpaceWizards.HttpListener/src/System/Net/WebSockets/WebSocketValidate.cs

@@ -1 +1 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
+// ReSharper disable PartialTypeWithSinglePart
+// ReSharper disable ConditionIsAlwaysTrueOrFalse
 
 using System.Diagnostics;