Fix session state issues

The loop of pending messages was stuck. We saved a session expiry interval of 0. I may need to change that session copying idea.

Fix session state issues
The loop of pending messages was stuck. We saved a session expiry interval of 0. I may need to change that session copying idea.
Wiebe Cazemier
1 parent d789ec01
Showing 2 changed files with 3 additions and 1 deletions
session.cpp
sessionsandsubscriptionsdb.cpp
@@ -70,6 +70,7 @@ Session::Session(const Session &amp;other)
     this->incomingQoS2MessageIds = other.incomingQoS2MessageIds;
     this->outgoingQoS2MessageIds = other.outgoingQoS2MessageIds;
     this->nextPacketId = other.nextPacketId;
+    this->sessionExpiryInterval = other.sessionExpiryInterval;
     // TODO: see git history for a change here. We now copy the whole queued publish. Do we want to address that?
     this->qosPacketQueue = other.qosPacketQueue;
@@ -246,6 +247,7 @@ uint64_t Session::sendPendingQosMessages()
                 pos = qosPacketQueue.erase(pos);
                 continue;
             }
+            pos++;
             MqttPacket p(c->getProtocolVersion(), pub);
             p.setDuplicate();
@@ -132,7 +132,7 @@ SessionsAndSubscriptionsResult SessionsAndSubscriptionsDB::readDataV2()
                 const uint32_t newPubAge = persistence_state_age + originalPubAge;
                 pub.setCreatedAt(timepointFromAge(newPubAge));
-                logger->logf(LOG_DEBUG, "Loaded QoS %d message for topic '%s'.", pub.qos, pub.topic.c_str());
+                logger->logf(LOG_DEBUG, "Loaded QoS %d message for topic '%s' for session '%s'.", pub.qos, pub.topic.c_str(), ses->getClientId().c_str());
                 ses->qosPacketQueue.queuePublish(std::move(pub), id);
             }