Return disconnect reason to user (#245)

marvinroger · May 24, 2021 · 29485e7 · 29485e7
1 parent 16e5ede
commit 29485e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/AsyncMqttClient.cpp b/src/AsyncMqttClient.cpp
@@ -2,9 +2,8 @@
 
 AsyncMqttClient::AsyncMqttClient()
 : _connected(false)
-, _connectPacketNotEnoughSpace(false)
 , _disconnectOnPoll(false)
-, _tlsBadFingerprint(false)
+, _disconnectReason(AsyncMqttClientDisconnectReason::TCP_DISCONNECTED)
 , _lastClientActivity(0)
 , _lastServerActivity(0)
 , _lastPingRequestTime(0)
@@ -159,8 +158,7 @@ void AsyncMqttClient::_clear() {
   _lastPingRequestTime = 0;
   _connected = false;
   _disconnectOnPoll = false;
-  _connectPacketNotEnoughSpace = false;
-  _tlsBadFingerprint = false;
+  _disconnectReason = AsyncMqttClientDisconnectReason::TCP_DISCONNECTED; // reset any previous
   _freeCurrentParsedPacket();
 
   _pendingPubRels.clear();
@@ -190,7 +188,7 @@ void AsyncMqttClient::_onConnect(AsyncClient* client) {
     }
 
     if (!sslFoundFingerprint) {
-      _tlsBadFingerprint = true;
+      _disconnectReason = AsyncMqttClientDisconnectReason::TLS_BAD_FINGERPRINT;
       _client.close(true);
       return;
     }
@@ -304,7 +302,7 @@ void AsyncMqttClient::_onConnect(AsyncClient* client) {
 
   SEMAPHORE_TAKE();
   if (_client.space() < neededSpace) {
-    _connectPacketNotEnoughSpace = true;
+    _disconnectReason = AsyncMqttClientDisconnectReason::ESP8266_NOT_ENOUGH_SPACE;
     _client.close(true);
     SEMAPHORE_GIVE();
     return;
@@ -354,16 +352,7 @@ void AsyncMqttClient::_onConnect(AsyncClient* client) {
 
 void AsyncMqttClient::_onDisconnect(AsyncClient* client) {
   (void)client;
-  AsyncMqttClientDisconnectReason reason;
-
-  if (_connectPacketNotEnoughSpace) {
-    reason = AsyncMqttClientDisconnectReason::ESP8266_NOT_ENOUGH_SPACE;
-  } else if (_tlsBadFingerprint) {
-    reason = AsyncMqttClientDisconnectReason::TLS_BAD_FINGERPRINT;
-  } else {
-    reason = AsyncMqttClientDisconnectReason::TCP_DISCONNECTED;
-  }
-
+  AsyncMqttClientDisconnectReason reason = _disconnectReason;
   _clear();
 
   for (auto callback : _onDisconnectUserCallbacks) callback(reason);
@@ -501,6 +490,7 @@ void AsyncMqttClient::_onConnAck(bool sessionPresent, uint8_t connectReturnCode)
     for (auto callback : _onConnectUserCallbacks) callback(sessionPresent);
   } else {
     // Callbacks are handled by the ondisconnect function which is called from the AsyncTcp lib
+    _disconnectReason = static_cast<AsyncMqttClientDisconnectReason>(connectReturnCode);
   }
 }
 

diff --git a/src/AsyncMqttClient.hpp b/src/AsyncMqttClient.hpp
@@ -84,9 +84,8 @@ class AsyncMqttClient {
   AsyncClient _client;
 
   bool _connected;
-  bool _connectPacketNotEnoughSpace;
   bool _disconnectOnPoll;
-  bool _tlsBadFingerprint;
+  AsyncMqttClientDisconnectReason _disconnectReason;
   uint32_t _lastClientActivity;
   uint32_t _lastServerActivity;
   uint32_t _lastPingRequestTime;

diff --git a/src/AsyncMqttClient/DisconnectReasons.hpp b/src/AsyncMqttClient/DisconnectReasons.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-enum class AsyncMqttClientDisconnectReason : int8_t {
+enum class AsyncMqttClientDisconnectReason : uint8_t {
   TCP_DISCONNECTED = 0,
 
   MQTT_UNACCEPTABLE_PROTOCOL_VERSION = 1,