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

Refactoring

Browse Source
This commit is contained in:
Christian Kratky
2017-10-19 18:50:22 +02:00
parent 9915cc4492
commit 40b1be075c
31 changed files with 166 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Serializer/MqttPacketSerializer.cs
+10 -21
View File
@@ -58,19 +58,19 @@ namespace MQTTnet.Core.Serializer
return Serialize(connAckPacket, writer);
}
if (packet is MqttDisconnectPacket disconnectPacket)
if (packet is MqttDisconnectPacket)
{
return Serialize(disconnectPacket);
return SerializeEmptyPacket(MqttControlPacketType.Disconnect);
}
if (packet is MqttPingReqPacket pingReqPacket)
if (packet is MqttPingReqPacket)
{
return Serialize(pingReqPacket);
return SerializeEmptyPacket(MqttControlPacketType.PingReq);
}
if (packet is MqttPingRespPacket pingRespPacket)
if (packet is MqttPingRespPacket)
{
return Serialize(pingRespPacket);
return SerializeEmptyPacket(MqttControlPacketType.PingResp);
}
if (packet is MqttPublishPacket publishPacket)
@@ -338,6 +338,8 @@ namespace MQTTnet.Core.Serializer
private static void ValidateConnectPacket(MqttConnectPacket packet)
{
if (packet == null) throw new ArgumentNullException(nameof(packet));
if (string.IsNullOrEmpty(packet.ClientId) && !packet.CleanSession)
{
throw new MqttProtocolViolationException("CleanSession must be set if ClientId is empty [MQTT-3.1.3-7].");
@@ -346,6 +348,8 @@ namespace MQTTnet.Core.Serializer
private static void ValidatePublishPacket(MqttPublishPacket packet)
{
if (packet == null) throw new ArgumentNullException(nameof(packet));
if (packet.QualityOfServiceLevel == 0 && packet.Dup)
{
throw new MqttProtocolViolationException("Dup flag must be false for QoS 0 packets [MQTT-3.3.1-2].");
@@ -433,21 +437,6 @@ namespace MQTTnet.Core.Serializer
return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubRel, 0x02);
}
private static byte Serialize(MqttDisconnectPacket packet)
{
return SerializeEmptyPacket(MqttControlPacketType.Disconnect);
}
private static byte Serialize(MqttPingReqPacket packet)
{
return SerializeEmptyPacket(MqttControlPacketType.PingReq);
}
private static byte Serialize(MqttPingRespPacket packet)
{
return SerializeEmptyPacket(MqttControlPacketType.PingResp);
}
private static byte Serialize(MqttPublishPacket packet, MqttPacketWriter writer)
{
ValidatePublishPacket(packet);