DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored PayloadData.cs

Browse Source
This commit is contained in:
sta 2014-09-12 21:47:50 +09:00
parent 7bccab8fa0
commit 33e8d95488
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
websocket-sharp/PayloadData.cs
View File

@ -38,8 +38,9 @@ namespace WebSocketSharp
#region Private Fields #region Private Fields
private byte[] _appData; private byte[] _appData;
private ulong _appDataLength;
private byte[] _extData; private byte[] _extData;
private ulong _length; private ulong _extDataLength;
private bool _masked; private bool _masked;
#endregion #endregion
@ -50,40 +51,39 @@ namespace WebSocketSharp
#endregion #endregion
#region Public Constructors #region Internal Constructors
public PayloadData () internal PayloadData ()
: this (new byte[0], new byte[0], false) : this (new byte[0], new byte[0], false)
{ {
} }
public PayloadData (byte[] applicationData) internal PayloadData (byte[] applicationData)
: this (new byte[0], applicationData, false) : this (new byte[0], applicationData, false)
{ {
} }
public PayloadData (string applicationData) internal PayloadData (string applicationData)
: this (new byte[0], Encoding.UTF8.GetBytes (applicationData), false) : this (new byte[0], Encoding.UTF8.GetBytes (applicationData), false)
{ {
} }
public PayloadData (byte[] applicationData, bool masked) internal PayloadData (byte[] applicationData, bool masked)
: this (new byte[0], applicationData, masked) : this (new byte[0], applicationData, masked)
{ {
} }
public PayloadData (byte[] extensionData, byte[] applicationData, bool masked) internal PayloadData (byte[] extensionData, byte[] applicationData, bool masked)
{ {
var extLen = (ulong) extensionData.LongLength; _extDataLength = (ulong) extensionData.LongLength;
var appLen = (ulong) applicationData.LongLength; _appDataLength = (ulong) applicationData.LongLength;
if (appLen > MaxLength - extLen) if (_appDataLength > MaxLength - _extDataLength)
throw new ArgumentOutOfRangeException ( throw new ArgumentOutOfRangeException (
"The length of payload data is greater than the allowable length."); "The total length of 'extensionData' and 'applicationData' is greater than the allowable length.");
_extData = extensionData; _extData = extensionData;
_appData = applicationData; _appData = applicationData;
_masked = masked; _masked = masked;
_length = extLen + appLen;
} }
#endregion #endregion
@ -92,7 +92,7 @@ namespace WebSocketSharp
internal bool IncludesReservedCloseStatusCode { internal bool IncludesReservedCloseStatusCode {
get { get {
return _appData.Length > 1 && return _appDataLength > 1 &&
_appData.SubArray (0, 2).ToUInt16 (ByteOrder.Big).IsReserved (); _appData.SubArray (0, 2).ToUInt16 (ByteOrder.Big).IsReserved ();
} }
} }
@ -121,7 +121,7 @@ namespace WebSocketSharp
public ulong Length { public ulong Length {
get { get {
return _length; return _extDataLength + _appDataLength;
} }
} }
@ -137,31 +137,35 @@ namespace WebSocketSharp
#endregion #endregion
#region Public Methods #region Internal Methods
public IEnumerator<byte> GetEnumerator () internal void Mask (byte[] key)
{ {
foreach (byte b in _extData) if (_extDataLength > 0)
yield return b; mask (_extData, key);
foreach (byte b in _appData) if (_appDataLength > 0)
yield return b; mask (_appData, key);
}
public void Mask (byte[] maskingKey)
{
if (_extData.LongLength > 0)
mask (_extData, maskingKey);
if (_appData.LongLength > 0)
mask (_appData, maskingKey);
_masked = !_masked; _masked = !_masked;
} }
#endregion
#region Public Methods
public IEnumerator<byte> GetEnumerator ()
{
foreach (var b in _extData)
yield return b;
foreach (var b in _appData)
yield return b;
}
public byte[] ToByteArray () public byte[] ToByteArray ()
{ {
return _extData.LongLength > 0 return _extDataLength > 0
? new List<byte> (this).ToArray () ? new List<byte> (this).ToArray ()
: _appData; : _appData;
} }
@ -173,7 +177,7 @@ namespace WebSocketSharp
#endregion #endregion
#region Explicitly Implemented Interface Members #region Explicit Interface Implementations
IEnumerator IEnumerable.GetEnumerator () IEnumerator IEnumerable.GetEnumerator ()
{ {