Fix regression caused by crash fix

The fix caused the connack and publish packets of persistent sessions to be sent in the wrong order.
slavslavov · Nov 5, 2024 · d1f366f · d1f366f
1 parent be07c03
commit d1f366f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client.cpp b/client.cpp
@@ -649,7 +649,6 @@ void Client::sendConnackSuccess()
     }
 
     ConnAck &connAck = *this->stagedConnack.get();
-    setAuthenticated(true);
     MqttPacket response(connAck);
     writeMqttPacket(response);
     logger->logf(LOG_NOTICE, "Client '%s' logged in successfully", repr().c_str());

diff --git a/threaddata.cpp b/threaddata.cpp
@@ -237,8 +237,9 @@ void ThreadData::continuationOfAuthentication(std::shared_ptr<Client> &client, A
                 client->setWillFromStaged();
             }
 
-            subscriptionStore->registerClientAndKickExistingOne(client);
             client->sendConnackSuccess();
+            subscriptionStore->registerClientAndKickExistingOne(client);
+            client->setAuthenticated(true);
         }
         else // Reauth (to authenticated clients) sends AUTH on success.
         {