From 8542bccc55111bde33cb3f26ba6fa98fed3393e4 Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 26 Sep 2015 11:57:34 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/WebSocketFrame.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs index dafad8f4..de343152 100644 --- a/websocket-sharp/WebSocketFrame.cs +++ b/websocket-sharp/WebSocketFrame.cs @@ -145,6 +145,16 @@ namespace WebSocketSharp } } + public ulong FullPayloadLength { + get { + return _payloadLength < 126 + ? _payloadLength + : _payloadLength == 126 + ? _extPayloadLength.ToUInt16 (ByteOrder.Big) + : _extPayloadLength.ToUInt64 (ByteOrder.Big); + } + } + public bool IsBinary { get { return _opcode == Opcode.Binary; @@ -577,12 +587,7 @@ Extended Payload Length: {7} private static WebSocketFrame readPayloadData (Stream stream, WebSocketFrame frame) { - ulong len = frame._payloadLength < 126 - ? frame._payloadLength - : frame._payloadLength == 126 - ? frame._extPayloadLength.ToUInt16 (ByteOrder.Big) - : frame._extPayloadLength.ToUInt64 (ByteOrder.Big); - + var len = frame.FullPayloadLength; if (len == 0) { frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); return frame; @@ -612,12 +617,7 @@ Extended Payload Length: {7} Action completed, Action error) { - ulong len = frame._payloadLength < 126 - ? frame._payloadLength - : frame._payloadLength == 126 - ? frame._extPayloadLength.ToUInt16 (ByteOrder.Big) - : frame._extPayloadLength.ToUInt64 (ByteOrder.Big); - + var len = frame.FullPayloadLength; if (len == 0) { frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); completed (frame);