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-10-02 15:03:10 +09:00
parent e02b553739
commit 242c96efd7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
websocket-sharp/WebSocketFrame.cs
View File

@ -605,15 +605,16 @@ Extended Payload Length: {7}
CloseStatusCode.TooBig, CloseStatusCode.TooBig,
"The length of 'Payload Data' of a frame is greater than the allowable max length."); "The length of 'Payload Data' of a frame is greater than the allowable max length.");
var llen = (long) len;
var bytes = frame._payloadLength < 127 var bytes = frame._payloadLength < 127
? stream.ReadBytes ((int) len) ? stream.ReadBytes ((int) len)
: stream.ReadBytes ((long) len, 1024); : stream.ReadBytes (llen, 1024);
if (bytes.LongLength != (long) len) if (bytes.LongLength != llen)
throw new WebSocketException ( throw new WebSocketException (
"The 'Payload Data' of a frame cannot be read from the data source."); "The 'Payload Data' of a frame cannot be read from the data source.");
frame._payloadData = new PayloadData (bytes); frame._payloadData = new PayloadData (bytes, llen);
return frame; return frame;
} }
@ -637,12 +638,13 @@ Extended Payload Length: {7}
CloseStatusCode.TooBig, CloseStatusCode.TooBig,
"The length of 'Payload Data' of a frame is greater than the allowable max length."); "The length of 'Payload Data' of a frame is greater than the allowable max length.");
var llen = (long) len;
Action<byte[]> compl = bytes => { Action<byte[]> compl = bytes => {
if (bytes.LongLength != (long) len) if (bytes.LongLength != llen)
throw new WebSocketException ( throw new WebSocketException (
"The 'Payload Data' of a frame cannot be read from the data source."); "The 'Payload Data' of a frame cannot be read from the data source.");
frame._payloadData = new PayloadData (bytes); frame._payloadData = new PayloadData (bytes, llen);
completed (frame); completed (frame);
}; };
@ -651,7 +653,7 @@ Extended Payload Length: {7}
return; return;
} }
stream.ReadBytesAsync ((long) len, 1024, compl, error); stream.ReadBytesAsync (llen, 1024, compl, error);
} }
#endregion #endregion