Will stuff in connect

Wiebe Cazemier
1 parent 21bf9bf5
Showing 3 changed files with 21 additions and 0 deletions
client.cpp
client.h
mqttpacket.cpp
@@ -241,6 +241,14 @@ void Client::setClientProperties(const std::string &amp;clientId, const std::string 
     this->keepalive = keepalive;
 }
+void Client::setWill(const std::string &topic, const std::string &payload, bool retain, char qos)
+{
+    this->will_topic = topic;
+    this->will_payload = payload;
+    this->will_retain = retain;
+    this->will_qos = qos;
+}
+
@@ -41,6 +41,11 @@ class Client
     std::string username;
     uint16_t keepalive = 0;
+    std::string will_topic;
+    std::string will_payload;
+    bool will_retain = false;
+    char will_qos = 0;
+
     ThreadData_p threadData;
     std::mutex writeBufMutex;
@@ -108,6 +113,7 @@ public:
     bool readFdIntoBuffer();
     bool bufferToMqttPackets(std::vector<MqttPacket> &packetQueueIn, Client_p &sender);
     void setClientProperties(const std::string &clientId, const std::string username, bool connectPacketSeen, uint16_t keepalive);
+    void setWill(const std::string &topic, const std::string &payload, bool retain, char qos);
     void setAuthenticated(bool value) { authenticated = value;}
     bool getAuthenticated() { return authenticated; }
     bool hasConnectPacketSeen() { return connectPacketSeen; }
@@ -133,10 +133,16 @@ void MqttPacket::handleConnect()
         std::string username;
         std::string password;
+        std::string will_topic;
+        std::string will_payload;
         if (will_flag)
         {
+            uint16_t will_topic_length = readTwoBytesToUInt16();
+            will_topic = std::string(readBytes(will_topic_length), will_topic_length);
+            uint16_t will_payload_length = readTwoBytesToUInt16();
+            will_payload = std::string(readBytes(will_payload_length), will_payload_length);
         }
         if (user_name_flag)
         {
@@ -152,6 +158,7 @@ void MqttPacket::handleConnect()
         // TODO: validate UTF8 encoded username/password.
         sender->setClientProperties(client_id, username, true, keep_alive);
+        sender->setWill(will_topic, will_payload, will_retain, will_qos);
         sender->setAuthenticated(true);
         std::cout << "Connect: " << sender->repr() << std::endl;