Fix due to the modified Ext.cs

README.md

@@ -294,8 +294,8 @@ Please access [http://localhost:4649](http://localhost:4649) to do WebSocket Ech
 
 **websocket-sharp** supports **[RFC 6455]**.
 
-- **[branch: hybi-00]** supports older draft-ietf-hybi-thewebsocketprotocol-00 (**[hybi-00]**).
-- **[branch: draft75]** supports even more old draft-hixie-thewebsocketprotocol-75 (**[hixie-75]**).
+- **[branch: hybi-00]** supports older draft-ietf-hybi-thewebsocketprotocol-00 ( **[hybi-00]** ).
+- **[branch: draft75]** supports even more old draft-hixie-thewebsocketprotocol-75 ( **[hixie-75]** ).
 
 ## Reference ##
 

websocket-sharp/Frame/PayloadData.cs

@@ -32,40 +32,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace WebSocketSharp.Frame
-{
-  public class PayloadData : IEnumerable<byte>
-  {
-
-    #region Public Static Fields
+namespace WebSocketSharp.Frame {
 
-    public static readonly ulong MaxLength;
-
-    #endregion
-
-    #region Properties
-
-    public byte[] ExtensionData   { get; private set; }
-    public byte[] ApplicationData { get; private set; }
-
-    public bool IsMasked { get; private set; }
-
-    public ulong Length
-    {
-      get
+  public class PayloadData : IEnumerable<byte>
   {
-        return (ulong)(ExtensionData.LongLength + ApplicationData.LongLength);
-      }
-    }
-
-    #endregion
+    #region Field
 
-    #region Static Constructor
-
-    static PayloadData()
-    {
-      MaxLength = long.MaxValue;
-    }
+    public const ulong MaxLength = long.MaxValue;
 
     #endregion
 
@@ -93,18 +66,14 @@ namespace WebSocketSharp.Frame
 
     public PayloadData(byte[] extData, byte[] appData, bool masked)
     {
-      Func<string, Action> func = s => () =>
-      {
-        string message = String.Format("{0} must not be null.", s);
-        throw new ArgumentNullException(message);
-      };
-      extData.IsNullDo(func("extData"));
-      appData.IsNullDo(func("appData"));
+      if (extData.IsNull())
+        throw new ArgumentNullException("extData");
+
+      if (appData.IsNull())
+        throw new ArgumentNullException("appData");
 
       if ((ulong)extData.LongLength + (ulong)appData.LongLength > MaxLength)
-      {
-        throw new ArgumentOutOfRangeException("Plus extData length and appData lenght must be less than MaxLength.");
-      }
+        throw new ArgumentOutOfRangeException("Plus 'extData' length and 'appData' lenght must be less than MaxLength.");
 
       ExtensionData   = extData;
       ApplicationData = appData;
@@ -113,20 +82,33 @@ namespace WebSocketSharp.Frame
 
     #endregion
 
+    #region Properties
+
+    public byte[] ExtensionData   { get; private set; }
+    public byte[] ApplicationData { get; private set; }
+
+    public bool IsMasked { get; private set; }
+
+    public ulong Length {
+      get {
+        return (ulong)(ExtensionData.LongLength + ApplicationData.LongLength);
+      }
+    }
+
+    #endregion
+
     #region Private Methods
 
-    private void mask(byte[] src, byte[] key)
+    IEnumerator IEnumerable.GetEnumerator()
     {
-      if (key.Length != 4)
-      {
-        throw new ArgumentOutOfRangeException("key length must be 4.");
+      return GetEnumerator();
     }
 
-      for (long i = 0; i < src.LongLength; i++)
+    private void mask(byte[] src, byte[] key)
     {
+      for (long i = 0; i < src.LongLength; i++)
         src[i] = (byte)(src[i] ^ key[i % 4]);
     }
-    }
 
     #endregion
 
@@ -135,45 +117,34 @@ namespace WebSocketSharp.Frame
     public IEnumerator<byte> GetEnumerator()
     {
       foreach (byte b in ExtensionData)
-      {
         yield return b;
-      }
+
       foreach (byte b in ApplicationData)
-      {
         yield return b;
     }
-    }
-
-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-    {
-      return GetEnumerator();
-    }
 
     public void Mask(byte[] maskingKey)
     {
+      if (maskingKey.IsNull())
+        throw new ArgumentNullException("maskingKey");
+
+      if (maskingKey.Length != 4)
+        throw new ArgumentOutOfRangeException("maskingKey", "'maskingKey' length must be 4.");
+
       if (ExtensionData.LongLength > 0)
-      {
         mask(ExtensionData, maskingKey);
-      }
 
       if (ApplicationData.LongLength > 0)
-      {
         mask(ApplicationData, maskingKey);
-      }
 
       IsMasked = !IsMasked;
     }
 
     public byte[] ToBytes()
     {
-      if (ExtensionData.LongLength > 0)
-      {
-        return ExtensionData.Concat(ApplicationData).ToArray();
-      }
-      else
-      {
-        return ApplicationData;
-      }
+      return ExtensionData.LongLength > 0
+             ? ExtensionData.Concat(ApplicationData).ToArray()
+             : ApplicationData;
     }
 
     public override string ToString()

websocket-sharp/Frame/WsFrame.cs

@@ -38,16 +38,7 @@ namespace WebSocketSharp.Frame {
   {
     #region Field
 
-    private static readonly int _readBufferLen;
-
-    #endregion
-
-    #region Static Constructor
-
-    static WsFrame()
-    {
-      _readBufferLen = 1024;
-    }
+    private const int _readBufferLen = 1024;
 
     #endregion
 
@@ -171,16 +162,18 @@ namespace WebSocketSharp.Frame {
     {
       var length = frame.PayloadLen <= 125
                  ? 0
-                 : frame.PayloadLen == 126 ? 2 : 8;
+                 : frame.PayloadLen == 126
+                   ? 2
+                   : 8;
 
-      if (length > 0)
-      {
-        var extLength = stream.ReadBytes(length);
-        if (extLength == null)
+      if (length == 0)
+        return;
+
+      var extLen = stream.ReadBytes(length);
+      if (extLen.Length != length)
         throw new IOException();
 
-        frame.ExtPayloadLen = extLength;
-      }
+      frame.ExtPayloadLen = extLen;
     }
 
     private static WsFrame readHeader(byte[] header)
@@ -213,15 +206,15 @@ namespace WebSocketSharp.Frame {
 
     private static void readMaskingKey(Stream stream, WsFrame frame)
     {
-      if (frame.Masked == Mask.MASK)
-      {
+      if (frame.Masked == Mask.UNMASK)
+        return;
+
       var maskingKey = stream.ReadBytes(4);
-        if (maskingKey == null)
+      if (maskingKey.Length != 4)
         throw new IOException();
 
       frame.MaskingKey = maskingKey;
     }
-    }
 
     private static void readPayloadData(Stream stream, WsFrame frame, bool unmask)
     {
@@ -231,28 +224,32 @@ namespace WebSocketSharp.Frame {
                      ? frame.ExtPayloadLen.To<ushort>(ByteOrder.BIG)
                      : frame.ExtPayloadLen.To<ulong>(ByteOrder.BIG);
 
+      if (length == 0)
+      {
+        frame.PayloadData = new PayloadData(new byte[]{});
+        return;
+      }
+
+      if (frame.PayloadLen > 126 && length > PayloadData.MaxLength)
+        throw new WsReceivedTooBigMessageException();
+
       var buffer = length <= (ulong)_readBufferLen
                  ? stream.ReadBytes((int)length)
                  : stream.ReadBytes((long)length, _readBufferLen);
 
-      if (buffer == null)
+      if (buffer.LongLength != (long)length)
         throw new IOException();
 
-      PayloadData payloadData;
-      if (frame.Masked == Mask.MASK)
-      {
-        payloadData = new PayloadData(buffer, true);
-        if (unmask == true)
+      var payloadData = frame.Masked == Mask.MASK
+                      ? new PayloadData(buffer, true)
+                      : new PayloadData(buffer);
+
+      if (frame.Masked == Mask.MASK && unmask)
       {
         payloadData.Mask(frame.MaskingKey);
         frame.Masked = Mask.UNMASK;
         frame.MaskingKey = new byte[]{};
       }
-      }
-      else
-      {
-        payloadData = new PayloadData(buffer);
-      }
 
       frame.PayloadData = payloadData;
     }
@@ -462,7 +459,7 @@ namespace WebSocketSharp.Frame {
     {
       var buffer = new List<byte>();
 
-      int header = (int)Fin;
+      var header = (int)Fin;
       header = (header << 1) + (int)Rsv1;
       header = (header << 1) + (int)Rsv2;
       header = (header << 1) + (int)Rsv3;

websocket-sharp/Net/HttpStatusCode.cs

@@ -1,6 +1,6 @@
 //
 // HttpStatusCode.cs
-//	Copied from System.Net.HttpStatusCode
+//	Copied from System.Net.HttpStatusCode.cs
 //
 // This code was automatically generated from
 // ECMA CLI XML Library Specification.
@@ -34,6 +34,7 @@
 namespace WebSocketSharp.Net {
 
 	public enum HttpStatusCode {
+
 		Continue = 100,
 		SwitchingProtocols = 101,
 		OK = 200,