解决websocket消息长度解析问题

xljiulang · Jul 18, 2016 · c62409e · c62409e
1 parent 97d1e88
commit c62409e
Show file tree

Hide file tree

Showing 3 changed files with 406 additions and 394 deletions.
diff --git a/Demo/MixServer/Controller/WebApiController.cs b/Demo/MixServer/Controller/WebApiController.cs
@@ -21,7 +21,7 @@ public JsonResult About()
             return Json(new { assembly = names.Name, version = names.Version.ToString() });
         }
 
-        [HttpPost]
+        [HttpPost]       
         public JsonResult Login(string account, string password)
         {
             return Json(new { account, password });

diff --git a/Net40/NetworkSocket/WebSocket/FrameRequest.cs b/Net40/NetworkSocket/WebSocket/FrameRequest.cs
@@ -1,126 +1,130 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket.WebSocket
-{
-    /// <summary>
-    /// 表示WebSocket请求帧
-    /// </summary>
-    public class FrameRequest
-    {
-        /// <summary>
-        /// 获取是否已完成
-        /// </summary>
-        public bool Fin { get; private set; }
-
-        /// <summary>
-        /// 获取保存位
-        /// </summary>
-        public ByteBits Rsv { get; private set; }
-
-        /// <summary>
-        /// 获取帧类型
-        /// </summary>
-        public FrameCodes Frame { get; private set; }
-
-        /// <summary>
-        /// 获取是否有掩码
-        /// </summary>
-        public bool Mask { get; private set; }
-
-        /// <summary>
-        /// 获取内容长度
-        /// </summary>
-        public int ContentLength { get; private set; }
-
-        /// <summary>
-        /// 获取掩码
-        /// </summary>
-        public byte[] MaskingKey { get; private set; }
-
-        /// <summary>
-        /// 获取请求帧的内容
-        /// </summary>
-        public byte[] Content { get; private set; }
-
-
-        /// <summary>
-        /// 解析请求的数据
-        /// 返回请求数据包
-        /// </summary>
-        /// <param name="buffer">所有收到的数据</param>  
-        /// <returns></returns>
-        public unsafe static FrameRequest Parse(IReceiveBuffer buffer)
-        {
-            if (buffer.Length < 2)
-            {
-                return null;
-            }
-
-            ByteBits byte0 = buffer[0];
-            var fin = byte0[0];
-            var frameCode = (FrameCodes)(byte)byte0.Take(4, 4);
-
-            if (fin == false || frameCode == FrameCodes.Continuation)
-            {
-                return null;
-            }
-
-            var rsv = byte0.Take(1, 3);
-            ByteBits byte1 = buffer[1];
-            var mask = byte1[0];
-
-            if (mask == false || Enum.IsDefined(typeof(FrameCodes), frameCode) == false || rsv != 0)
-            {
-                return null;
-            }
-
-            var contentLength = (int)byte1.Take(1, 7);
-            buffer.Position = 2;
-
-            if (contentLength == 127)
-            {
-                contentLength = (int)buffer.ReadUInt64();
-            }
-            else if (contentLength == 126)
-            {
-                contentLength = (int)buffer.ReadUInt16();
-            }
-
-            var packetLength = 6 + contentLength;
-            if (buffer.Length < packetLength)
-            {
-                return null;
-            }
-
-            var maskingKey = buffer.ReadArray(4);
-            var content = buffer.ReadArray(contentLength);
-            buffer.Clear(packetLength);
-
-            if (contentLength > 0)
-            {
-                fixed (byte* pcontent = &content[0], pmask = &maskingKey[0])
-                {
-                    for (var i = 0; i < contentLength; i++)
-                    {
-                        *(pcontent + i) = (byte)(*(pcontent + i) ^ *(pmask + i % 4));
-                    }
-                }
-            }
-
-            return new FrameRequest
-            {
-                Fin = fin,
-                Rsv = rsv,
-                Mask = mask,
-                Frame = frameCode,
-                ContentLength = contentLength,
-                MaskingKey = maskingKey,
-                Content = content
-            };
-        }
-    }
-}
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NetworkSocket.WebSocket
+{
+    /// <summary>
+    /// 表示WebSocket请求帧
+    /// </summary>
+    public class FrameRequest
+    {
+        /// <summary>
+        /// 获取是否已完成
+        /// </summary>
+        public bool Fin { get; private set; }
+
+        /// <summary>
+        /// 获取保存位
+        /// </summary>
+        public ByteBits Rsv { get; private set; }
+
+        /// <summary>
+        /// 获取帧类型
+        /// </summary>
+        public FrameCodes Frame { get; private set; }
+
+        /// <summary>
+        /// 获取是否有掩码
+        /// </summary>
+        public bool Mask { get; private set; }
+
+        /// <summary>
+        /// 获取内容长度
+        /// </summary>
+        public int ContentLength { get; private set; }
+
+        /// <summary>
+        /// 获取掩码
+        /// </summary>
+        public byte[] MaskingKey { get; private set; }
+
+        /// <summary>
+        /// 获取请求帧的内容
+        /// </summary>
+        public byte[] Content { get; private set; }
+
+
+        /// <summary>
+        /// 解析请求的数据
+        /// 返回请求数据包
+        /// </summary>
+        /// <param name="buffer">所有收到的数据</param>  
+        /// <exception cref="NotSupportedException"></exception>
+        /// <returns></returns>
+        public unsafe static FrameRequest Parse(IReceiveBuffer buffer)
+        {
+            if (buffer.Length < 2)
+            {
+                return null;
+            }
+
+            ByteBits byte0 = buffer[0];
+            var fin = byte0[0];
+            var frameCode = (FrameCodes)(byte)byte0.Take(4, 4);
+
+            if (fin == false || frameCode == FrameCodes.Continuation)
+            {
+                return null;
+            }
+
+            var rsv = byte0.Take(1, 3);
+            ByteBits byte1 = buffer[1];
+            var mask = byte1[0];
+
+            if (mask == false || Enum.IsDefined(typeof(FrameCodes), frameCode) == false || rsv != 0)
+            {
+                throw new NotSupportedException();
+            }
+
+            var contentSize = 0;
+            var contentLength = (int)byte1.Take(1, 7);
+            buffer.Position = 2;
+
+            if (contentLength == 127)
+            {
+                contentSize = 4;
+                contentLength = (int)buffer.ReadUInt64();
+            }
+            else if (contentLength == 126)
+            {
+                contentSize = 2;
+                contentLength = (int)buffer.ReadUInt16();
+            }
+
+            var packetLength = 6 + contentSize + contentLength;
+            if (buffer.Length < packetLength)
+            {
+                return null;
+            }
+
+            var maskingKey = buffer.ReadArray(4);
+            var content = buffer.ReadArray(contentLength);
+            buffer.Clear(packetLength);
+
+            if (contentLength > 0)
+            {
+                fixed (byte* pcontent = &content[0], pmask = &maskingKey[0])
+                {
+                    for (var i = 0; i < contentLength; i++)
+                    {
+                        *(pcontent + i) = (byte)(*(pcontent + i) ^ *(pmask + i % 4));
+                    }
+                }
+            }
+
+            return new FrameRequest
+            {
+                Fin = fin,
+                Rsv = rsv,
+                Mask = mask,
+                Frame = frameCode,
+                ContentLength = contentLength,
+                MaskingKey = maskingKey,
+                Content = content
+            };
+        }
+    }
+}