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

Replaced the processFragmentedFrame method with the processFragmentedFrame2 method, and renamed

Browse Source
This commit is contained in:
sta 2015-07-23 16:39:06 +09:00
parent 82077d321c
commit 0be4389d97
1 changed files with 1 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
websocket-sharp/WebSocket.cs
View File

@ -734,60 +734,6 @@ namespace WebSocketSharp
return ret; return ret;
} }
private bool concatenateFragmentsInto (Stream destination)
{
while (true) {
var frame = WebSocketFrame.Read (_stream, false);
var msg = checkIfValidReceivedFrame (frame);
if (msg != null)
return processUnsupportedFrame (frame, CloseStatusCode.ProtocolError, msg);
frame.Unmask ();
if (frame.IsFinal) {
/* FINAL */
// CONT
if (frame.IsContinuation) {
destination.WriteBytes (frame.PayloadData.ApplicationData);
break;
}
// PING
if (frame.IsPing) {
processPingFrame (frame);
continue;
}
// PONG
if (frame.IsPong) {
processPongFrame (frame);
continue;
}
// CLOSE
if (frame.IsClose)
return processCloseFrame (frame);
}
else {
/* MORE */
// CONT
if (frame.IsContinuation) {
destination.WriteBytes (frame.PayloadData.ApplicationData);
continue;
}
}
// ?
return processUnsupportedFrame (
frame,
CloseStatusCode.UnsupportedData,
"Unsupported data has been received while receiving the fragmented data.");
}
return true;
}
private bool connect () private bool connect ()
{ {
lock (_forConn) { lock (_forConn) {
@ -1022,14 +968,9 @@ namespace WebSocketSharp
} }
private bool processFragmentedFrame (WebSocketFrame frame) private bool processFragmentedFrame (WebSocketFrame frame)
{
// Must process first fragment.
return frame.IsContinuation || processFragments (frame);
}
private bool processFragmentedFrame2 (WebSocketFrame frame)
{ {
if (!_inContinuation) { if (!_inContinuation) {
// Must process first fragment.
if (frame.IsContinuation) if (frame.IsContinuation)
return true; return true;
@ -1055,27 +996,6 @@ namespace WebSocketSharp
return true; return true;
} }
private bool processFragments (WebSocketFrame first)
{
using (var buff = new MemoryStream ()) {
buff.WriteBytes (first.PayloadData.ApplicationData);
if (!concatenateFragmentsInto (buff))
return false;
byte[] data;
if (_compression != CompressionMethod.None) {
data = buff.DecompressToArray (_compression);
}
else {
buff.Close ();
data = buff.ToArray ();
}
enqueueToMessageEventQueue (new MessageEventArgs (first.Opcode, data));
return true;
}
}
private bool processPingFrame (WebSocketFrame frame) private bool processPingFrame (WebSocketFrame frame)
{ {
if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToByteArray ())) if (send (new WebSocketFrame (Opcode.Pong, frame.PayloadData, _client).ToByteArray ()))