Skip to content

Fixing reading frame header async when the initial read does not read a full frame. #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing reading frame header async when the initial read does not read a full frame. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c93db1c
ng reading frame header async when the initial read does not read a full
potat0 Apr 17, 2018
b5e1acf
fixing reading large header size
potat0 Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions vtortola.WebSockets/Header/WebSocketFrameHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ public static Boolean TryParse(byte[] frameStart, int offset, int headerLength,
if (frameStart.Length < headerLength)
return false;

contentLength = frameStart.ToUInt16(2, BitConverter.IsLittleEndian);
contentLength = frameStart.ToUInt16(offset+2, BitConverter.IsLittleEndian);
}
else if (contentLength == 127)
{
if (frameStart.Length < headerLength)
return false;

var length = frameStart.ToUInt64(2, BitConverter.IsLittleEndian);
var length = frameStart.ToUInt64(offset+2, BitConverter.IsLittleEndian);
if (length > long.MaxValue)
{
throw new WebSocketException("The maximum supported frame length is 9223372036854775807, current frame is " + length.ToString());
Expand Down
8 changes: 6 additions & 2 deletions vtortola.WebSockets/Rfc6455/WebSocketConnectionRfc6455.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,19 +248,23 @@ private void ParseHeader(int readed)

private async Task ParseHeaderAsync(int readed)
{
if (await TryReadHeaderUntilAsync(readed, 6).ConfigureAwait(false) == -1)
var bytesRead = await TryReadHeaderUntilAsync(readed, 6).ConfigureAwait(false);
if (bytesRead == -1)
{
Close(WebSocketCloseReasons.ProtocolError);
return;
}
readed += bytesRead;

var headerlength = WebSocketFrameHeader.GetHeaderLength(_headerBuffer.Array, _headerBuffer.Offset);

if (await TryReadHeaderUntilAsync(readed, headerlength).ConfigureAwait(false) == -1)
bytesRead = await TryReadHeaderUntilAsync(readed, headerlength).ConfigureAwait(false);
if (bytesRead == -1)
{
Close(WebSocketCloseReasons.ProtocolError);
return;
}
readed += bytesRead;

await ProcessHeaderFrameAsync(headerlength).ConfigureAwait(false);
}
Expand Down