DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2015-09-26 11:57:34 +09:00
parent d2bb267306
commit 8542bccc55
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
websocket-sharp/WebSocketFrame.cs
View File

@ -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 { public bool IsBinary {
get { get {
return _opcode == Opcode.Binary; return _opcode == Opcode.Binary;
@ -577,12 +587,7 @@ Extended Payload Length: {7}
private static WebSocketFrame readPayloadData (Stream stream, WebSocketFrame frame) private static WebSocketFrame readPayloadData (Stream stream, WebSocketFrame frame)
{ {
ulong len = frame._payloadLength < 126 var len = frame.FullPayloadLength;
? frame._payloadLength
: frame._payloadLength == 126
? frame._extPayloadLength.ToUInt16 (ByteOrder.Big)
: frame._extPayloadLength.ToUInt64 (ByteOrder.Big);
if (len == 0) { if (len == 0) {
frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked);
return frame; return frame;
@ -612,12 +617,7 @@ Extended Payload Length: {7}
Action<WebSocketFrame> completed, Action<WebSocketFrame> completed,
Action<Exception> error) Action<Exception> error)
{ {
ulong len = frame._payloadLength < 126 var len = frame.FullPayloadLength;
? frame._payloadLength
: frame._payloadLength == 126
? frame._extPayloadLength.ToUInt16 (ByteOrder.Big)
: frame._extPayloadLength.ToUInt64 (ByteOrder.Big);
if (len == 0) { if (len == 0) {
frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked); frame._payloadData = new PayloadData (WebSocket.EmptyBytes, frame.IsMasked);
completed (frame); completed (frame);