Don't save sessions from 'clean session' clients

Wiebe Cazemier
1 parent 1ee96e98
Showing 3 changed files with 17 additions and 0 deletions
session.cpp
session.h
subscriptionstore.cpp
@@ -282,3 +282,13 @@ void Session::removeOutgoingQoS2MessageId(u_int16_t packet_id)
     if (it != outgoingQoS2MessageIds.end())
         outgoingQoS2MessageIds.erase(it);
 }
+
+bool Session::getCleanSession() const
+{
+    auto c = client.lock();
+
+    if (!c)
+        return false;
+
+    return c->getCleanSession();
+}
@@ -82,6 +82,8 @@ public:
     void addOutgoingQoS2MessageId(uint16_t packet_id);
     void removeOutgoingQoS2MessageId(u_int16_t packet_id);
+
+    bool getCleanSession() const;
 };
 #endif // SESSION_H
@@ -685,6 +685,11 @@ void SubscriptionStore::saveSessionsAndSubscriptions(const std::string &amp;filePath
         for (const auto &pair : sessionsByIdConst)
         {
             const Session &org = *pair.second.get();
+
+            // Sessions created with clean session need to be destroyed when disconnecting, so no point in saving them.
+            if (org.getCleanSession())
+                continue;
+
             sessionCopies.push_back(org.getCopy());
         }