From 842b5b3b3a0644a995eb47ff21a6e566cc6b9e8d Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 12 Dec 2015 15:26:05 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/WebSocket.cs | 6 +++--- websocket-sharp/WebSocketFrame.cs | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index cd35951b..225a577a 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1109,7 +1109,7 @@ namespace WebSocketSharp new CloseEventArgs (code, reason ?? code.GetMessage ()), !code.IsReserved (), false, false); } - private bool processFragmentedFrame (WebSocketFrame frame) + private bool processFragmentFrame (WebSocketFrame frame) { if (!_inContinuation) { // Must process first fragment. @@ -1165,8 +1165,8 @@ namespace WebSocketSharp return processUnsupportedFrame (frame, CloseStatusCode.ProtocolError, msg); frame.Unmask (); - return frame.IsFragmented - ? processFragmentedFrame (frame) + return frame.IsFragment + ? processFragmentFrame (frame) : frame.IsData ? processDataFrame (frame) : frame.IsPing diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs index 7ee1353a..6168f219 100644 --- a/websocket-sharp/WebSocketFrame.cs +++ b/websocket-sharp/WebSocketFrame.cs @@ -214,7 +214,7 @@ namespace WebSocketSharp } } - public bool IsFragmented { + public bool IsFragment { get { return _fin == Fin.More || _opcode == Opcode.Cont; } @@ -403,8 +403,7 @@ namespace WebSocketSharp ? String.Empty : payloadLen > 125 ? "---" - : frame.IsText && - !(frame.IsMasked || frame.IsFragmented || frame.IsCompressed) + : frame.IsText && !(frame.IsFragment || frame.IsMasked || frame.IsCompressed) ? frame._payloadData.ApplicationData.UTF8Decode () : frame._payloadData.ToString ();