YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-20 19:58:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong value for graceful socket close handling.

Browse Source
This commit is contained in:
Christian
2022-04-21 20:49:09 +02:00
parent fcf276dd1a
commit 2d9ae0576b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Adapter/MqttChannelAdapter.cs
+5 -7
View File
@@ -239,19 +239,19 @@ namespace MQTTnet.Adapter
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
return -1; return 0;
} }
var readCount = await _channel.ReadAsync(_singleByteBuffer, 0, 1, cancellationToken).ConfigureAwait(false); var readCount = await _channel.ReadAsync(_singleByteBuffer, 0, 1, cancellationToken).ConfigureAwait(false);
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
return -1; return 0;
} }
if (readCount == 0) if (readCount == 0)
{ {
return -1; return 0;
} }
_packetInspector?.FillReceiveBuffer(_singleByteBuffer); _packetInspector?.FillReceiveBuffer(_singleByteBuffer);
@@ -301,8 +301,7 @@ namespace MQTTnet.Adapter
} }
var bodyLength = await ReadBodyLengthAsync(buffer[1], cancellationToken).ConfigureAwait(false); var bodyLength = await ReadBodyLengthAsync(buffer[1], cancellationToken).ConfigureAwait(false);
if (bodyLength == 0)
if (bodyLength == -1)
{ {
return new ReadFixedHeaderResult return new ReadFixedHeaderResult
{ {
@@ -336,10 +335,9 @@ namespace MQTTnet.Adapter
return ReceivedMqttPacket.Empty; return ReceivedMqttPacket.Empty;
} }
IsReadingPacket = true;
try try
{ {
IsReadingPacket = true;
var fixedHeader = readFixedHeaderResult.FixedHeader; var fixedHeader = readFixedHeaderResult.FixedHeader;
if (fixedHeader.RemainingLength == 0) if (fixedHeader.RemainingLength == 0)
{ {