More property handling, dummy and otherwise

Wiebe Cazemier
1 parent 9e29bb2a
Showing 3 changed files with 17 additions and 2 deletions
mqtt5properties.cpp
mqtt5properties.h
mqttpacket.cpp
@@ -108,6 +108,11 @@ void Mqtt5PropertyBuilder::writeUserProperty(const std::string &amp;key, const std::
     write2Str(Mqtt5Properties::UserProperty, key, value);
 }
+void Mqtt5PropertyBuilder::writeCorrelationData(const std::string &correlationData)
+{
+    writeStr(Mqtt5Properties::CorrelationData, correlationData);
+}
+
 void Mqtt5PropertyBuilder::writeUint32(Mqtt5Properties prop, const uint32_t x, std::vector<char> &target)
 {
     size_t pos = target.size();
@@ -40,6 +40,7 @@ public:
     void writeMessageExpiryInterval(uint32_t val);
     void writeResponseTopic(const std::string &str);
     void writeUserProperty(const std::string &key, const std::string &value);
+    void writeCorrelationData(const std::string &correlationData);
 };
 #endif // MQTT5PROPERTIES_H
@@ -449,7 +449,8 @@ void MqttPacket::handleConnect()
                     case Mqtt5Properties::CorrelationData:
                     {
                         const uint16_t len = readTwoBytesToUInt16();
-                        readBytes(len);
+                        const std::string correlationData(readBytes(len), len);
+                        publishData.propertyBuilder->writeCorrelationData(correlationData);
                         break;
                     }
                     case Mqtt5Properties::UserProperty:
@@ -640,9 +641,16 @@ void MqttPacket::handleSubscribe()
             switch (prop)
             {
             case Mqtt5Properties::SubscriptionIdentifier:
+                decodeVariableByteIntAtPos();
                 break;
             case Mqtt5Properties::UserProperty:
+            {
+                const uint16_t len = readTwoBytesToUInt16();
+                readBytes(len);
+                const uint16_t len2 = readTwoBytesToUInt16();
+                readBytes(len2);
                 break;
+            }
             default:
                 throw ProtocolError("Invalid subscribe property.");
             }
@@ -839,7 +847,8 @@ void MqttPacket::handlePublish()
             case Mqtt5Properties::CorrelationData:
             {
                 const uint16_t len = readTwoBytesToUInt16();
-                readBytes(len);
+                const std::string correlationData(readBytes(len), len);
+                publishData.propertyBuilder->writeCorrelationData(correlationData);
                 break;
             }
             case Mqtt5Properties::UserProperty: