From 9d9c92f91df8ce85e85750ee93b693ef787f1446 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 20 Jan 2017 11:48:00 +0100 Subject: [PATCH] using client IDs actually works with 3.1 --- src/mqtt/qmqttconnection.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp index 0a174e0..6b4ffff 100644 --- a/src/mqtt/qmqttconnection.cpp +++ b/src/mqtt/qmqttconnection.cpp @@ -139,18 +139,13 @@ bool QMqttConnection::sendControlConnect() // 3.1.3 Payload // 3.1.3.1 Client Identifier - if (protocolVersion == 3) { // no username + // Client id maximum left is 23 + const QByteArray clientStringArray = m_client->clientId().left(23).toUtf8(); + if (clientStringArray.size()) { + packet.append(clientStringArray); + } else { packet.append(char(0)); packet.append(char(0)); - } else if (protocolVersion == 4) { - // Client id maximum left is 23 - const QByteArray clientStringArray = m_client->clientId().left(23).toUtf8(); - if (clientStringArray.size()) { - packet.append(clientStringArray); - } else { - packet.append(char(0)); - packet.append(char(0)); - } } if (!writePacketToTransport(packet)) {