From ee177afb7cd21156e398ed8b79511fa7ab1a9586 Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 7 Oct 2015 11:08:34 +0900 Subject: [PATCH] [Modify] Rename it --- websocket-sharp/Server/WebSocketServiceManager.cs | 2 +- websocket-sharp/Server/WebSocketSessionManager.cs | 6 +++--- websocket-sharp/WebSocket.cs | 2 +- websocket-sharp/WebSocketFrame.cs | 11 +++++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs index 7c7e89d4..5a742024 100644 --- a/websocket-sharp/Server/WebSocketServiceManager.cs +++ b/websocket-sharp/Server/WebSocketServiceManager.cs @@ -551,7 +551,7 @@ namespace WebSocketSharp.Server return null; } - return broadping (WebSocketFrame.EmptyUnmaskPingBytes, _waitTime); + return broadping (WebSocketFrame.EmptyPingBytes, _waitTime); } /// diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs index 357e0135..6a0071eb 100644 --- a/websocket-sharp/Server/WebSocketSessionManager.cs +++ b/websocket-sharp/Server/WebSocketSessionManager.cs @@ -99,7 +99,7 @@ namespace WebSocketSharp.Server /// public IEnumerable ActiveIDs { get { - foreach (var res in Broadping (WebSocketFrame.EmptyUnmaskPingBytes, _waitTime)) + foreach (var res in Broadping (WebSocketFrame.EmptyPingBytes, _waitTime)) if (res.Value) yield return res.Key; } @@ -144,7 +144,7 @@ namespace WebSocketSharp.Server /// public IEnumerable InactiveIDs { get { - foreach (var res in Broadping (WebSocketFrame.EmptyUnmaskPingBytes, _waitTime)) + foreach (var res in Broadping (WebSocketFrame.EmptyPingBytes, _waitTime)) if (!res.Value) yield return res.Key; } @@ -558,7 +558,7 @@ namespace WebSocketSharp.Server return null; } - return Broadping (WebSocketFrame.EmptyUnmaskPingBytes, _waitTime); + return Broadping (WebSocketFrame.EmptyPingBytes, _waitTime); } /// diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index bca18389..b65aec3a 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -2226,7 +2226,7 @@ namespace WebSocketSharp { var bytes = _client ? WebSocketFrame.CreatePingFrame (true).ToArray () - : WebSocketFrame.EmptyUnmaskPingBytes; + : WebSocketFrame.EmptyPingBytes; return Ping (bytes, _waitTime); } diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs index 8445f147..2ee8687b 100644 --- a/websocket-sharp/WebSocketFrame.cs +++ b/websocket-sharp/WebSocketFrame.cs @@ -60,7 +60,14 @@ namespace WebSocketSharp #region Internal Fields - internal static readonly byte[] EmptyUnmaskPingBytes; + /// + /// Represents the Ping frame without the payload data as an array of . + /// + /// + /// The value of this field is created from an unmasked Ping frame, so it can only be used to + /// send a Ping from a server. + /// + internal static readonly byte[] EmptyPingBytes; #endregion @@ -68,7 +75,7 @@ namespace WebSocketSharp static WebSocketFrame () { - EmptyUnmaskPingBytes = CreatePingFrame (false).ToArray (); + EmptyPingBytes = CreatePingFrame (false).ToArray (); } #endregion