Corrected subscribing a bit

Wiebe Cazemier
1 parent 33d19cec
Showing 3 changed files with 11 additions and 11 deletions
mqttpacket.cpp
types.cpp
types.h
@@ -196,19 +196,20 @@ void MqttPacket::handleSubscribe(std::shared_ptr&lt;SubscriptionStore&gt; &amp;subscriptio
 {
     uint16_t packet_id = readTwoBytesToUInt16();
  
-    std::list<std::string> subs; // TODO: list of tuples, probably
-    while (remainingAfterPos() > 1)
+    std::list<char> subs_reponse_codes;
+    while (remainingAfterPos() > 0)
     {
         uint16_t topicLength = readTwoBytesToUInt16();
         std::string topic(readBytes(topicLength), topicLength);
+        char qos = readByte();
+        if (qos > 0)
+            throw NotImplementedException("QoS not implemented");
         std::cout << sender->repr() << " Subscribed to " << topic << std::endl;
         subscriptionStore->addSubscription(sender, topic);
-        subs.push_back(std::move(topic));
+        subs_reponse_codes.push_back(qos);
     }
  
-    char flags = readByte();
-
-    SubAck subAck(packet_id, subs);
+    SubAck subAck(packet_id, subs_reponse_codes);
     MqttPacket response(subAck);
     sender->writeMqttPacket(response);
 }
@@ -6,13 +6,12 @@ ConnAck::ConnAck(ConnAckReturnCodes return_code) :
  
 }
  
-SubAck::SubAck(uint16_t packet_id, const std::list<std::string> &subs) :
+SubAck::SubAck(uint16_t packet_id, const std::list<char> &subs_qos_reponses) :
     packet_id(packet_id)
 {
-    // dummy
-    for(size_t i = 0; i < subs.size(); i++)
+    for (char ack_code : subs_qos_reponses)
     {
-        responses.push_back(SubAckReturnCodes::MaxQoS0);
+        responses.push_back(static_cast<SubAckReturnCodes>(ack_code));
     }
 }
  
@@ -64,7 +64,7 @@ class SubAck
 public:
     uint16_t packet_id;
     std::list<SubAckReturnCodes> responses;
-    SubAck(uint16_t packet_id, const std::list<std::string> &subs);
+    SubAck(uint16_t packet_id, const std::list<char> &subs_qos_reponses);
 };
  
 class Publish