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

Unused parameter in WithTryPrivate causing client to send incorrect version byte in header. (#2125)

Browse Source 
* fix: unused tryPrivate parameter in WithTryPrivate

* Fix wrong usage of try private

---------

Co-authored-by: christian <6939810+chkr1011@users.noreply.github.com>
This commit is contained in:
Victornor
2024-12-10 19:37:29 +01:00
committed by GitHub
co-authored by christian
parent 8566fd5395
commit 981ea02149
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Formatter/V3/MqttV3PacketFormatter.cs
+18 -19
View File
@@ -18,9 +18,9 @@ namespace MQTTnet.Formatter.V3
{
const int FixedHeaderSize = 1;
static readonly MqttDisconnectPacket DisconnectPacket = new MqttDisconnectPacket();
static readonly MqttDisconnectPacket DisconnectPacket = new();
readonly MqttBufferReader _bufferReader = new MqttBufferReader();
readonly MqttBufferReader _bufferReader = new();
readonly MqttBufferWriter _bufferWriter;
readonly MqttProtocolVersion _mqttProtocolVersion;
@@ -68,10 +68,8 @@ namespace MQTTnet.Formatter.V3
{
return DecodeConnAckPacketV311(receivedMqttPacket.Body);
}
else
{
return DecodeConnAckPacket(receivedMqttPacket.Body);
}
return DecodeConnAckPacket(receivedMqttPacket.Body);
case MqttControlPacketType.Disconnect:
return DisconnectPacket;
@@ -106,10 +104,6 @@ namespace MQTTnet.Formatter.V3
payload = publishPacket.Payload;
remainingLength += (uint)payload.Length;
}
else
{
publishPacket = null;
}
var remainingLengthSize = MqttBufferWriter.GetVariableByteIntegerSize(remainingLength);
@@ -481,7 +475,16 @@ namespace MQTTnet.Formatter.V3
ValidateConnectPacket(packet);
bufferWriter.WriteString("MQTT");
bufferWriter.WriteByte(4); // 3.1.2.2 Protocol Level 4
// 3.1.2.2 Protocol Level 4
var protocolVersion = 4;
if (packet.TryPrivate)
{
protocolVersion |= 0x80;
}
bufferWriter.WriteByte((byte)protocolVersion);
byte connectFlags = 0x0;
if (packet.CleanSession)
@@ -552,19 +555,15 @@ namespace MQTTnet.Formatter.V3
{
return EncodeConnectPacketV311(connectPacket, bufferWriter);
}
else
{
return EncodeConnectPacket(connectPacket, bufferWriter);
}
return EncodeConnectPacket(connectPacket, bufferWriter);
case MqttConnAckPacket connAckPacket:
if (_mqttProtocolVersion == MqttProtocolVersion.V311)
{
return EncodeConnAckPacketV311(connAckPacket, bufferWriter);
}
else
{
return EncodeConnAckPacket(connAckPacket, bufferWriter);
}
return EncodeConnAckPacket(connAckPacket, bufferWriter);
case MqttDisconnectPacket _:
return EncodeEmptyPacket(MqttControlPacketType.Disconnect);
case MqttPingReqPacket _: