From dee36926ae19d38e36d216781240deb490c239ca Mon Sep 17 00:00:00 2001 From: sta Date: Tue, 5 May 2015 15:21:28 +0900 Subject: [PATCH] Added the WebSocket.CheckPingParameter method, and removed the Ext.CheckIfValidControlData method --- websocket-sharp/Ext.cs | 7 ------- websocket-sharp/Server/WebSocketServiceManager.cs | 6 ++---- websocket-sharp/Server/WebSocketSessionManager.cs | 6 ++---- websocket-sharp/WebSocket.cs | 10 ++++++++-- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 6d7806cf..9b363c03 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -251,13 +251,6 @@ namespace WebSocketSharp : null; } - internal static string CheckIfValidControlData (this byte[] data, string paramName) - { - return data.Length > 125 - ? String.Format ("'{0}' has greater than the allowable max size.", paramName) - : null; - } - internal static string CheckIfValidProtocols (this string[] protocols) { return protocols.Contains ( diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs index 6d5b1217..bbe7fccf 100644 --- a/websocket-sharp/Server/WebSocketServiceManager.cs +++ b/websocket-sharp/Server/WebSocketServiceManager.cs @@ -566,10 +566,8 @@ namespace WebSocketSharp.Server if (message == null || message.Length == 0) return Broadping (); - byte[] data = null; - var msg = _state.CheckIfStart () ?? - (data = Encoding.UTF8.GetBytes (message)).CheckIfValidControlData ("message"); - + byte[] data; + var msg = _state.CheckIfStart () ?? WebSocket.CheckPingParameter (message, out data); if (msg != null) { _logger.Error (msg); return null; diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs index 04b265a1..b745524c 100644 --- a/websocket-sharp/Server/WebSocketSessionManager.cs +++ b/websocket-sharp/Server/WebSocketSessionManager.cs @@ -571,10 +571,8 @@ namespace WebSocketSharp.Server if (message == null || message.Length == 0) return Broadping (); - byte[] data = null; - var msg = _state.CheckIfStart () ?? - (data = Encoding.UTF8.GetBytes (message)).CheckIfValidControlData ("message"); - + byte[] data; + var msg = _state.CheckIfStart () ?? WebSocket.CheckPingParameter (message, out data); if (msg != null) { _logger.Error (msg); return null; diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 7468f056..db1e3b17 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1588,6 +1588,12 @@ namespace WebSocketSharp : null; } + internal static string CheckPingParameter (string message, out byte[] bytes) + { + bytes = Encoding.UTF8.GetBytes (message); + return bytes.Length > 125 ? "A message has greater than the allowable max size." : null; + } + // As server internal void Close (HttpResponse response) { @@ -2114,8 +2120,8 @@ namespace WebSocketSharp if (message == null || message.Length == 0) return Ping (); - var data = Encoding.UTF8.GetBytes (message); - var msg = data.CheckIfValidControlData ("message"); + byte[] data; + var msg = CheckPingParameter (message, out data); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the ping.", null);