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

Modified Mask enum values to PascalCase values

Browse Source
This commit is contained in:
sta 2014-03-01 15:16:25 +09:00
parent 4a1919e0fb
commit 4304310430
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
websocket-sharp/Mask.cs
View File

@ -4,8 +4,8 @@
* *
* The MIT License * The MIT License
* *
* Copyright (c) 2012-2013 sta.blockhead * Copyright (c) 2012-2014 sta.blockhead
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
@ -15,7 +15,7 @@
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -28,11 +28,11 @@
using System; using System;
namespace WebSocketSharp { namespace WebSocketSharp
{
internal enum Mask : byte internal enum Mask : byte
{ {
UNMASK = 0x0, Unmask = 0x0,
MASK = 0x1 Mask = 0x1
} }
} }

4
websocket-sharp/Server/WebSocketServiceManager.cs
View File

@ -318,7 +318,7 @@ namespace WebSocketSharp.Server
var payload = new PayloadData (data); var payload = new PayloadData (data);
var args = new CloseEventArgs (payload); var args = new CloseEventArgs (payload);
var frameAsBytes = send var frameAsBytes = send
? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray ()
: null; : null;
foreach (var host in _hosts.Values) foreach (var host in _hosts.Values)
@ -547,7 +547,7 @@ namespace WebSocketSharp.Server
return null; return null;
} }
return broadping (WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); return broadping (WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
} }
/// <summary> /// <summary>

4
websocket-sharp/Server/WebSocketSessionManager.cs
View File

@ -368,7 +368,7 @@ namespace WebSocketSharp.Server
var payload = new PayloadData (data); var payload = new PayloadData (data);
var args = new CloseEventArgs (payload); var args = new CloseEventArgs (payload);
var frameAsBytes = send var frameAsBytes = send
? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray ()
: null; : null;
Stop (args, frameAsBytes); Stop (args, frameAsBytes);
@ -585,7 +585,7 @@ namespace WebSocketSharp.Server
} }
return Broadping ( return Broadping (
WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
} }
/// <summary> /// <summary>

20
websocket-sharp/WebSocket.cs
View File

@ -605,7 +605,7 @@ namespace WebSocketSharp
private bool acceptPingFrame (WsFrame frame) private bool acceptPingFrame (WsFrame frame)
{ {
var mask = _client ? Mask.MASK : Mask.UNMASK; var mask = _client ? Mask.Mask : Mask.Unmask;
if (send (WsFrame.CreatePongFrame (mask, frame.PayloadData))) if (send (WsFrame.CreatePongFrame (mask, frame.PayloadData)))
_logger.Trace ("Returned a Pong."); _logger.Trace ("Returned a Pong.");
@ -732,11 +732,11 @@ namespace WebSocketSharp
args.WasClean = args.WasClean =
_client _client
? closeHandshake ( ? closeHandshake (
send ? WsFrame.CreateCloseFrame (Mask.MASK, payload).ToByteArray () : null, send ? WsFrame.CreateCloseFrame (Mask.Mask, payload).ToByteArray () : null,
wait ? 5000 : 0, wait ? 5000 : 0,
closeClientResources) closeClientResources)
: closeHandshake ( : closeHandshake (
send ? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () : null, send ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null,
wait ? 1000 : 0, wait ? 1000 : 0,
closeServerResources); closeServerResources);
@ -1078,7 +1078,7 @@ namespace WebSocketSharp
compressed = true; compressed = true;
} }
var mask = _client ? Mask.MASK : Mask.UNMASK; var mask = _client ? Mask.Mask : Mask.Unmask;
sent = send (WsFrame.CreateFrame (Fin.Final, opcode, mask, data, compressed)); sent = send (WsFrame.CreateFrame (Fin.Final, opcode, mask, data, compressed));
} }
catch (Exception ex) { catch (Exception ex) {
@ -1102,7 +1102,7 @@ namespace WebSocketSharp
compressed = true; compressed = true;
} }
var mask = _client ? Mask.MASK : Mask.UNMASK; var mask = _client ? Mask.Mask : Mask.Unmask;
sent = sendFragmented (opcode, stream, mask, compressed); sent = sendFragmented (opcode, stream, mask, compressed);
} }
catch (Exception ex) { catch (Exception ex) {
@ -1445,7 +1445,7 @@ namespace WebSocketSharp
cached = WsFrame.CreateFrame ( cached = WsFrame.CreateFrame (
Fin.Final, Fin.Final,
opcode, opcode,
Mask.UNMASK, Mask.Unmask,
data.Compress (_compression), data.Compress (_compression),
_compression != CompressionMethod.NONE) _compression != CompressionMethod.NONE)
.ToByteArray (); .ToByteArray ();
@ -1477,7 +1477,7 @@ namespace WebSocketSharp
cached.Position = 0; cached.Position = 0;
if (_readyState == WebSocketState.OPEN) if (_readyState == WebSocketState.OPEN)
sendFragmented (opcode, cached, Mask.UNMASK, _compression != CompressionMethod.NONE); sendFragmented (opcode, cached, Mask.Unmask, _compression != CompressionMethod.NONE);
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());
@ -1797,7 +1797,7 @@ namespace WebSocketSharp
public bool Ping () public bool Ping ()
{ {
return _client return _client
? Ping (WsFrame.CreatePingFrame (Mask.MASK).ToByteArray (), 5000) ? Ping (WsFrame.CreatePingFrame (Mask.Mask).ToByteArray (), 5000)
: Ping (WsFrame.EmptyUnmaskPingData, 1000); : Ping (WsFrame.EmptyUnmaskPingData, 1000);
} }
@ -1826,8 +1826,8 @@ namespace WebSocketSharp
} }
return _client return _client
? Ping (WsFrame.CreatePingFrame (Mask.MASK, data).ToByteArray (), 5000) ? Ping (WsFrame.CreatePingFrame (Mask.Mask, data).ToByteArray (), 5000)
: Ping (WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); : Ping (WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
} }
/// <summary> /// <summary>

18
websocket-sharp/WsFrame.cs
View File

@ -46,7 +46,7 @@ namespace WebSocketSharp
static WsFrame () static WsFrame ()
{ {
EmptyUnmaskPingData = CreatePingFrame (Mask.UNMASK).ToByteArray (); EmptyUnmaskPingData = CreatePingFrame (Mask.Unmask).ToByteArray ();
} }
#endregion #endregion
@ -62,7 +62,7 @@ namespace WebSocketSharp
#region Public Constructors #region Public Constructors
public WsFrame (Opcode opcode, PayloadData payload) public WsFrame (Opcode opcode, PayloadData payload)
: this (opcode, Mask.MASK, payload) : this (opcode, Mask.Mask, payload)
{ {
} }
@ -107,7 +107,7 @@ namespace WebSocketSharp
/* MaskingKey */ /* MaskingKey */
var masking = mask == Mask.MASK; var masking = mask == Mask.Mask;
var maskingKey = masking var maskingKey = masking
? createMaskingKey () ? createMaskingKey ()
: new byte []{}; : new byte []{};
@ -178,7 +178,7 @@ namespace WebSocketSharp
internal bool IsMasked { internal bool IsMasked {
get { get {
return Mask == Mask.MASK; return Mask == Mask.Mask;
} }
} }
@ -352,7 +352,7 @@ namespace WebSocketSharp
private static bool isMasked (Mask mask) private static bool isMasked (Mask mask)
{ {
return mask == Mask.MASK; return mask == Mask.Mask;
} }
private static bool isPing (Opcode opcode) private static bool isPing (Opcode opcode)
@ -385,7 +385,7 @@ namespace WebSocketSharp
// Opcode // Opcode
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.Mask : Mask.Unmask;
// Payload len // Payload len
var payloadLen = (byte) (header [1] & 0x7f); var payloadLen = (byte) (header [1] & 0x7f);
@ -435,7 +435,7 @@ namespace WebSocketSharp
/* Masking Key */ /* Masking Key */
var masked = mask == Mask.MASK; var masked = mask == Mask.Mask;
var maskingKey = masked var maskingKey = masked
? stream.ReadBytes (4) ? stream.ReadBytes (4)
: new byte []{}; : new byte []{};
@ -479,7 +479,7 @@ namespace WebSocketSharp
if (masked && unmask) if (masked && unmask)
{ {
payload.Mask (maskingKey); payload.Mask (maskingKey);
frame.Mask = Mask.UNMASK; frame.Mask = Mask.Unmask;
frame.MaskingKey = new byte []{}; frame.MaskingKey = new byte []{};
} }
@ -682,7 +682,7 @@ Extended Payload Len: {7}
if (PayloadLen > 125) if (PayloadLen > 125)
buffer.Write (ExtPayloadLen, 0, ExtPayloadLen.Length); buffer.Write (ExtPayloadLen, 0, ExtPayloadLen.Length);
if (Mask == Mask.MASK) if (Mask == Mask.Mask)
buffer.Write (MaskingKey, 0, MaskingKey.Length); buffer.Write (MaskingKey, 0, MaskingKey.Length);
if (PayloadLen > 0) if (PayloadLen > 0)