DBTDevice: *connect* + disconnect: Lock via mutex *absent of proper atomic* and have hciConnHandle atomic for threading integrity.

1 files changed, 2 insertions, 1 deletions

diff --git a/api/direct_bt/DBTDevice.hpp b/api/direct_bt/DBTDevice.hpp
index fdbdc3db..6c8097d1 100644
--- a/api/direct_bt/DBTDevice.hpp
+++ b/api/direct_bt/DBTDevice.hpp
@@ -62,11 +62,12 @@ namespace direct_bt {
             int8_t rssi = 127; // The core spec defines 127 as the "not available" value
             int8_t tx_power = 127; // The core spec defines 127 as the "not available" value
             AppearanceCat appearance = AppearanceCat::UNKNOWN;
-            uint16_t hciConnHandle = 0;
+            std::atomic<uint16_t> hciConnHandle;
             std::shared_ptr<ManufactureSpecificData> msd = nullptr;
             std::vector<std::shared_ptr<uuid_t>> services;
             std::shared_ptr<GATTHandler> gattHandler = nullptr;
             std::shared_ptr<GenericAccess> gattGenericAccess = nullptr;
+            std::recursive_mutex mtx_connect;
             std::recursive_mutex mtx_data;
             std::recursive_mutex mtx_gatt;
             std::atomic<bool> isConnected;