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

[Modify] Polish it

Browse Source 
Rename them.
This commit is contained in:
sta 2015-10-22 15:21:36 +09:00
parent ce5cbdd67a
commit c262195f57
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websocket-sharp/Mask.cs
View File

@ -42,10 +42,10 @@ namespace WebSocketSharp
/// <summary> /// <summary>
/// Equivalent to numeric value 0. Indicates not masked. /// Equivalent to numeric value 0. Indicates not masked.
/// </summary> /// </summary>
Unmask = 0x0, None = 0x0,
/// <summary> /// <summary>
/// Equivalent to numeric value 1. Indicates masked. /// Equivalent to numeric value 1. Indicates masked.
/// </summary> /// </summary>
Mask = 0x1 Masked = 0x1
} }
} }

14
websocket-sharp/WebSocketFrame.cs
View File

@ -124,12 +124,12 @@ namespace WebSocketSharp
} }
if (mask) { if (mask) {
_mask = Mask.Mask; _mask = Mask.Masked;
_maskingKey = createMaskingKey (); _maskingKey = createMaskingKey ();
payloadData.Mask (_maskingKey); payloadData.Mask (_maskingKey);
} }
else { else {
_mask = Mask.Unmask; _mask = Mask.None;
_maskingKey = WebSocket.EmptyBytes; _maskingKey = WebSocket.EmptyBytes;
} }
@ -222,7 +222,7 @@ namespace WebSocketSharp
public bool IsMasked { public bool IsMasked {
get { get {
return _mask == Mask.Mask; return _mask == Mask.Masked;
} }
} }
@ -456,7 +456,7 @@ Extended Payload Length: {7}
var opcode = (Opcode) (header[0] & 0x0f); var opcode = (Opcode) (header[0] & 0x0f);
// MASK // MASK
var mask = (header[1] & 0x80) == 0x80 ? Mask.Mask : Mask.Unmask; var mask = (header[1] & 0x80) == 0x80 ? Mask.Masked : Mask.None;
// Payload Length // Payload Length
var payloadLen = (byte) (header[1] & 0x7f); var payloadLen = (byte) (header[1] & 0x7f);
@ -712,10 +712,10 @@ Extended Payload Length: {7}
internal void Unmask () internal void Unmask ()
{ {
if (_mask == Mask.Unmask) if (_mask == Mask.None)
return; return;
_mask = Mask.Unmask; _mask = Mask.None;
_payloadData.Mask (_maskingKey); _payloadData.Mask (_maskingKey);
_maskingKey = WebSocket.EmptyBytes; _maskingKey = WebSocket.EmptyBytes;
} }
@ -755,7 +755,7 @@ Extended Payload Length: {7}
if (_payloadLength > 125) if (_payloadLength > 125)
buff.Write (_extPayloadLength, 0, _payloadLength == 126 ? 2 : 8); buff.Write (_extPayloadLength, 0, _payloadLength == 126 ? 2 : 8);
if (_mask == Mask.Mask) if (_mask == Mask.Masked)
buff.Write (_maskingKey, 0, 4); buff.Write (_maskingKey, 0, 4);
if (_payloadLength > 0) { if (_payloadLength > 0) {