From 4304310430638047ff76e53ecd320c669ed2a7b4 Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 1 Mar 2014 15:16:25 +0900 Subject: [PATCH] Modified Mask enum values to PascalCase values --- websocket-sharp/Mask.cs | 14 ++++++------- .../Server/WebSocketServiceManager.cs | 4 ++-- .../Server/WebSocketSessionManager.cs | 4 ++-- websocket-sharp/WebSocket.cs | 20 +++++++++---------- websocket-sharp/WsFrame.cs | 18 ++++++++--------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/websocket-sharp/Mask.cs b/websocket-sharp/Mask.cs index 051b46bf..bd23b288 100644 --- a/websocket-sharp/Mask.cs +++ b/websocket-sharp/Mask.cs @@ -4,8 +4,8 @@ * * 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 * of this software and associated documentation files (the "Software"), to deal * 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 * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -28,11 +28,11 @@ using System; -namespace WebSocketSharp { - +namespace WebSocketSharp +{ internal enum Mask : byte { - UNMASK = 0x0, - MASK = 0x1 + Unmask = 0x0, + Mask = 0x1 } } diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs index 84629386..7e60b5c5 100644 --- a/websocket-sharp/Server/WebSocketServiceManager.cs +++ b/websocket-sharp/Server/WebSocketServiceManager.cs @@ -318,7 +318,7 @@ namespace WebSocketSharp.Server var payload = new PayloadData (data); var args = new CloseEventArgs (payload); var frameAsBytes = send - ? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () + ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null; foreach (var host in _hosts.Values) @@ -547,7 +547,7 @@ namespace WebSocketSharp.Server return null; } - return broadping (WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); + return broadping (WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000); } /// diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs index 3a16456e..03770f79 100644 --- a/websocket-sharp/Server/WebSocketSessionManager.cs +++ b/websocket-sharp/Server/WebSocketSessionManager.cs @@ -368,7 +368,7 @@ namespace WebSocketSharp.Server var payload = new PayloadData (data); var args = new CloseEventArgs (payload); var frameAsBytes = send - ? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () + ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null; Stop (args, frameAsBytes); @@ -585,7 +585,7 @@ namespace WebSocketSharp.Server } return Broadping ( - WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); + WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000); } /// diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index f2997dec..faf86f90 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -605,7 +605,7 @@ namespace WebSocketSharp 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))) _logger.Trace ("Returned a Pong."); @@ -732,11 +732,11 @@ namespace WebSocketSharp args.WasClean = _client ? closeHandshake ( - send ? WsFrame.CreateCloseFrame (Mask.MASK, payload).ToByteArray () : null, + send ? WsFrame.CreateCloseFrame (Mask.Mask, payload).ToByteArray () : null, wait ? 5000 : 0, closeClientResources) : closeHandshake ( - send ? WsFrame.CreateCloseFrame (Mask.UNMASK, payload).ToByteArray () : null, + send ? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null, wait ? 1000 : 0, closeServerResources); @@ -1078,7 +1078,7 @@ namespace WebSocketSharp 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)); } catch (Exception ex) { @@ -1102,7 +1102,7 @@ namespace WebSocketSharp compressed = true; } - var mask = _client ? Mask.MASK : Mask.UNMASK; + var mask = _client ? Mask.Mask : Mask.Unmask; sent = sendFragmented (opcode, stream, mask, compressed); } catch (Exception ex) { @@ -1445,7 +1445,7 @@ namespace WebSocketSharp cached = WsFrame.CreateFrame ( Fin.Final, opcode, - Mask.UNMASK, + Mask.Unmask, data.Compress (_compression), _compression != CompressionMethod.NONE) .ToByteArray (); @@ -1477,7 +1477,7 @@ namespace WebSocketSharp cached.Position = 0; if (_readyState == WebSocketState.OPEN) - sendFragmented (opcode, cached, Mask.UNMASK, _compression != CompressionMethod.NONE); + sendFragmented (opcode, cached, Mask.Unmask, _compression != CompressionMethod.NONE); } catch (Exception ex) { _logger.Fatal (ex.ToString ()); @@ -1797,7 +1797,7 @@ namespace WebSocketSharp public bool Ping () { return _client - ? Ping (WsFrame.CreatePingFrame (Mask.MASK).ToByteArray (), 5000) + ? Ping (WsFrame.CreatePingFrame (Mask.Mask).ToByteArray (), 5000) : Ping (WsFrame.EmptyUnmaskPingData, 1000); } @@ -1826,8 +1826,8 @@ namespace WebSocketSharp } return _client - ? Ping (WsFrame.CreatePingFrame (Mask.MASK, data).ToByteArray (), 5000) - : Ping (WsFrame.CreatePingFrame (Mask.UNMASK, data).ToByteArray (), 1000); + ? Ping (WsFrame.CreatePingFrame (Mask.Mask, data).ToByteArray (), 5000) + : Ping (WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000); } /// diff --git a/websocket-sharp/WsFrame.cs b/websocket-sharp/WsFrame.cs index 2433290f..c200b94e 100644 --- a/websocket-sharp/WsFrame.cs +++ b/websocket-sharp/WsFrame.cs @@ -46,7 +46,7 @@ namespace WebSocketSharp static WsFrame () { - EmptyUnmaskPingData = CreatePingFrame (Mask.UNMASK).ToByteArray (); + EmptyUnmaskPingData = CreatePingFrame (Mask.Unmask).ToByteArray (); } #endregion @@ -62,7 +62,7 @@ namespace WebSocketSharp #region Public Constructors public WsFrame (Opcode opcode, PayloadData payload) - : this (opcode, Mask.MASK, payload) + : this (opcode, Mask.Mask, payload) { } @@ -107,7 +107,7 @@ namespace WebSocketSharp /* MaskingKey */ - var masking = mask == Mask.MASK; + var masking = mask == Mask.Mask; var maskingKey = masking ? createMaskingKey () : new byte []{}; @@ -178,7 +178,7 @@ namespace WebSocketSharp internal bool IsMasked { get { - return Mask == Mask.MASK; + return Mask == Mask.Mask; } } @@ -352,7 +352,7 @@ namespace WebSocketSharp private static bool isMasked (Mask mask) { - return mask == Mask.MASK; + return mask == Mask.Mask; } private static bool isPing (Opcode opcode) @@ -385,7 +385,7 @@ namespace WebSocketSharp // Opcode var opcode = (Opcode) (header [0] & 0x0f); // MASK - var mask = (header [1] & 0x80) == 0x80 ? Mask.MASK : Mask.UNMASK; + var mask = (header [1] & 0x80) == 0x80 ? Mask.Mask : Mask.Unmask; // Payload len var payloadLen = (byte) (header [1] & 0x7f); @@ -435,7 +435,7 @@ namespace WebSocketSharp /* Masking Key */ - var masked = mask == Mask.MASK; + var masked = mask == Mask.Mask; var maskingKey = masked ? stream.ReadBytes (4) : new byte []{}; @@ -479,7 +479,7 @@ namespace WebSocketSharp if (masked && unmask) { payload.Mask (maskingKey); - frame.Mask = Mask.UNMASK; + frame.Mask = Mask.Unmask; frame.MaskingKey = new byte []{}; } @@ -682,7 +682,7 @@ Extended Payload Len: {7} if (PayloadLen > 125) buffer.Write (ExtPayloadLen, 0, ExtPayloadLen.Length); - if (Mask == Mask.MASK) + if (Mask == Mask.Mask) buffer.Write (MaskingKey, 0, MaskingKey.Length); if (PayloadLen > 0)