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

Suspend keep alive checking while a packet is being received.

Browse Source
This commit is contained in:
Christian Kratky
2018-05-29 23:13:53 +02:00
parent 7e0017d14a
commit a10183628b
14 changed files with 146 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frameworks/MQTTnet.NetStandard/Serializer/IMqttPacketSerializer.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using System;
using System.IO;
using MQTTnet.Adapter;
using MQTTnet.Packets;
namespace MQTTnet.Serializer
@@ -10,6 +10,6 @@ namespace MQTTnet.Serializer
ArraySegment<byte> Serialize(MqttBasePacket mqttPacket);
MqttBasePacket Deserialize(MqttPacketHeader header, Stream body);
MqttBasePacket Deserialize(ReceivedMqttPacket receivedMqttPacket);
}
}
Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs
+6 -23
View File
@@ -5,14 +5,12 @@ using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Channel;
using MQTTnet.Exceptions;
using MQTTnet.Packets;
using MQTTnet.Protocol;
namespace MQTTnet.Serializer
{
public static class MqttPacketReader
{
public static async Task<MqttPacketHeader> ReadHeaderAsync(IMqttChannel channel, CancellationToken cancellationToken)
public static async Task<byte?> ReadFixedHeaderAsync(IMqttChannel channel, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
@@ -29,22 +27,7 @@ namespace MQTTnet.Serializer
return null;
}
var fixedHeader = buffer[0];
var controlPacketType = fixedHeader >> 4;
if (controlPacketType < 1 || controlPacketType > 14)
{
throw new MqttProtocolViolationException($"The packet type is invalid ({controlPacketType}).");
}
var bodyLength = await ReadBodyLengthAsync(channel, cancellationToken).ConfigureAwait(false);
return new MqttPacketHeader
{
FixedHeader = fixedHeader,
ControlPacketType = (MqttControlPacketType)controlPacketType,
BodyLength = bodyLength
};
return buffer[0];
}
public static ushort ReadUInt16(this Stream stream)
@@ -80,9 +63,9 @@ namespace MQTTnet.Serializer
return stream.ReadBytes(length);
}
public static byte[] ReadRemainingData(this Stream stream, MqttPacketHeader header)
public static byte[] ReadRemainingData(this Stream stream)
{
return stream.ReadBytes(header.BodyLength - (int)stream.Position);
return stream.ReadBytes((int)(stream.Length - stream.Position));
}
public static byte[] ReadBytes(this Stream stream, int count)
@@ -92,7 +75,7 @@ namespace MQTTnet.Serializer
return buffer;
}
private static async Task<int> ReadBodyLengthAsync(IMqttChannel stream, CancellationToken cancellationToken)
public static async Task<int> ReadBodyLengthAsync(IMqttChannel channel, CancellationToken cancellationToken)
{
// Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
var multiplier = 1;
@@ -107,7 +90,7 @@ namespace MQTTnet.Serializer
throw new TaskCanceledException();
}
var readCount = await stream.ReadAsync(buffer, 0, 1, cancellationToken).ConfigureAwait(false);
var readCount = await channel.ReadAsync(buffer, 0, 1, cancellationToken).ConfigureAwait(false);
if (readCount <= 0)
{
throw new MqttCommunicationException("Connection closed while reading remaining length data.");
Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketSerializer.cs
+33 -25
View File
@@ -4,6 +4,7 @@ using MQTTnet.Protocol;
using System;
using System.IO;
using System.Linq;
using MQTTnet.Adapter;
namespace MQTTnet.Serializer
{
@@ -63,28 +64,34 @@ namespace MQTTnet.Serializer
}
}
public MqttBasePacket Deserialize(MqttPacketHeader header, Stream body)
public MqttBasePacket Deserialize(ReceivedMqttPacket receivedMqttPacket)
{
if (header == null) throw new ArgumentNullException(nameof(header));
if (body == null) throw new ArgumentNullException(nameof(body));
if (receivedMqttPacket == null) throw new ArgumentNullException(nameof(receivedMqttPacket));
switch (header.ControlPacketType)
var controlPacketType = receivedMqttPacket.FixedHeader >> 4;
if (controlPacketType < 1 || controlPacketType > 14)
{
case MqttControlPacketType.Connect: return DeserializeConnect(body);
case MqttControlPacketType.ConnAck: return DeserializeConnAck(body);
throw new MqttProtocolViolationException($"The packet type is invalid ({controlPacketType}).");
}
switch ((MqttControlPacketType)controlPacketType)
{
case MqttControlPacketType.Connect: return DeserializeConnect(receivedMqttPacket.Body);
case MqttControlPacketType.ConnAck: return DeserializeConnAck(receivedMqttPacket.Body);
case MqttControlPacketType.Disconnect: return new MqttDisconnectPacket();
case MqttControlPacketType.Publish: return DeserializePublish(header, body);
case MqttControlPacketType.PubAck: return DeserializePubAck(body);
case MqttControlPacketType.PubRec: return DeserializePubRec(body);
case MqttControlPacketType.PubRel: return DeserializePubRel(body);
case MqttControlPacketType.PubComp: return DeserializePubComp(body);
case MqttControlPacketType.Publish: return DeserializePublish(receivedMqttPacket);
case MqttControlPacketType.PubAck: return DeserializePubAck(receivedMqttPacket.Body);
case MqttControlPacketType.PubRec: return DeserializePubRec(receivedMqttPacket.Body);
case MqttControlPacketType.PubRel: return DeserializePubRel(receivedMqttPacket.Body);
case MqttControlPacketType.PubComp: return DeserializePubComp(receivedMqttPacket.Body);
case MqttControlPacketType.PingReq: return new MqttPingReqPacket();
case MqttControlPacketType.PingResp: return new MqttPingRespPacket();
case MqttControlPacketType.Subscribe: return DeserializeSubscribe(header, body);
case MqttControlPacketType.SubAck: return DeserializeSubAck(header, body);
case MqttControlPacketType.Unsubscibe: return DeserializeUnsubscribe(header, body);
case MqttControlPacketType.UnsubAck: return DeserializeUnsubAck(body);
default: throw new MqttProtocolViolationException($"Packet type ({(int)header.ControlPacketType}) not supported.");
case MqttControlPacketType.Subscribe: return DeserializeSubscribe(receivedMqttPacket.Body);
case MqttControlPacketType.SubAck: return DeserializeSubAck(receivedMqttPacket.Body);
case MqttControlPacketType.Unsubscibe: return DeserializeUnsubscribe(receivedMqttPacket.Body);
case MqttControlPacketType.UnsubAck: return DeserializeUnsubAck(receivedMqttPacket.Body);
default: throw new MqttProtocolViolationException($"Packet type ({controlPacketType}) not supported.");
}
}
@@ -138,7 +145,7 @@ namespace MQTTnet.Serializer
};
}
private static MqttBasePacket DeserializeUnsubscribe(MqttPacketHeader header, Stream body)
private static MqttBasePacket DeserializeUnsubscribe(Stream body)
{
ThrowIfBodyIsEmpty(body);
@@ -147,7 +154,7 @@ namespace MQTTnet.Serializer
PacketIdentifier = body.ReadUInt16(),
};
while (body.Position != header.BodyLength)
while (body.Position != body.Length)
{
packet.TopicFilters.Add(body.ReadStringWithLengthPrefix());
}
@@ -155,7 +162,7 @@ namespace MQTTnet.Serializer
return packet;
}
private static MqttBasePacket DeserializeSubscribe(MqttPacketHeader header, Stream body)
private static MqttBasePacket DeserializeSubscribe(Stream body)
{
ThrowIfBodyIsEmpty(body);
@@ -164,7 +171,7 @@ namespace MQTTnet.Serializer
PacketIdentifier = body.ReadUInt16()
};
while (body.Position != header.BodyLength)
while (body.Position != body.Length)
{
packet.TopicFilters.Add(new TopicFilter(
body.ReadStringWithLengthPrefix(),
@@ -174,11 +181,12 @@ namespace MQTTnet.Serializer
return packet;
}
private static MqttBasePacket DeserializePublish(MqttPacketHeader header, Stream body)
private static MqttBasePacket DeserializePublish(ReceivedMqttPacket receivedMqttPacket)
{
var body = receivedMqttPacket.Body;
ThrowIfBodyIsEmpty(body);
var fixedHeader = new ByteReader(header.FixedHeader);
var fixedHeader = new ByteReader(receivedMqttPacket.FixedHeader);
var retain = fixedHeader.Read();
var qualityOfServiceLevel = (MqttQualityOfServiceLevel)fixedHeader.Read(2);
var dup = fixedHeader.Read();
@@ -196,7 +204,7 @@ namespace MQTTnet.Serializer
PacketIdentifier = packetIdentifier,
Retain = retain,
Topic = topic,
Payload = body.ReadRemainingData(header),
Payload = body.ReadRemainingData(),
QualityOfServiceLevel = qualityOfServiceLevel,
Dup = dup
};
@@ -282,7 +290,7 @@ namespace MQTTnet.Serializer
return packet;
}
private static MqttBasePacket DeserializeSubAck(MqttPacketHeader header, Stream body)
private static MqttBasePacket DeserializeSubAck(Stream body)
{
ThrowIfBodyIsEmpty(body);
@@ -291,7 +299,7 @@ namespace MQTTnet.Serializer
PacketIdentifier = body.ReadUInt16()
};
while (body.Position != header.BodyLength)
while (body.Position != body.Length)
{
packet.SubscribeReturnCodes.Add((MqttSubscribeReturnCode)body.ReadByte());
}