From d699a8d49ad92b963b0a138b10e6beb8f98e0070 Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 30 Sep 2015 12:28:48 +0900 Subject: [PATCH] [Modify] Remove it It will never ever be used. --- websocket-sharp/PayloadData.cs | 16 +++------------- websocket-sharp/WebSocketFrame.cs | 8 ++++---- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/websocket-sharp/PayloadData.cs b/websocket-sharp/PayloadData.cs index 2130ca76..1c6e6f9f 100644 --- a/websocket-sharp/PayloadData.cs +++ b/websocket-sharp/PayloadData.cs @@ -40,7 +40,6 @@ namespace WebSocketSharp private byte[] _data; private long _extDataLength; private long _length; - private bool _masked; #endregion @@ -71,15 +70,14 @@ namespace WebSocketSharp } internal PayloadData (byte[] data) - : this (data, false) + : this (data, data.LongLength) { } - internal PayloadData (byte[] data, bool masked) + internal PayloadData (byte[] data, long length) { _data = data; - _masked = masked; - _length = data.LongLength; + _length = length; } #endregion @@ -122,12 +120,6 @@ namespace WebSocketSharp } } - public bool IsMasked { - get { - return _masked; - } - } - public ulong Length { get { return (ulong) _length; @@ -142,8 +134,6 @@ namespace WebSocketSharp { for (long i = 0; i < _length; i++) _data[i] = (byte) (_data[i] ^ key[i % 4]); - - _masked = !_masked; } #endregion diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs index 79ee7152..2ef5e758 100644 --- a/websocket-sharp/WebSocketFrame.cs +++ b/websocket-sharp/WebSocketFrame.cs @@ -595,7 +595,7 @@ Extended Payload Length: {7} { var len = frame.FullPayloadLength; if (len == 0) { - frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); + frame._payloadData = new PayloadData (); return frame; } @@ -613,7 +613,7 @@ Extended Payload Length: {7} throw new WebSocketException ( "The 'Payload Data' of a frame cannot be read from the data source."); - frame._payloadData = new PayloadData (bytes, frame.IsMasked); + frame._payloadData = new PayloadData (bytes); return frame; } @@ -625,7 +625,7 @@ Extended Payload Length: {7} { var len = frame.FullPayloadLength; if (len == 0) { - frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); + frame._payloadData = new PayloadData (); completed (frame); return; @@ -642,7 +642,7 @@ Extended Payload Length: {7} throw new WebSocketException ( "The 'Payload Data' of a frame cannot be read from the data source."); - frame._payloadData = new PayloadData (bytes, frame.IsMasked); + frame._payloadData = new PayloadData (bytes); completed (frame); };