Merge pull request #144 from taks/fix-multiple-drop

Fixed BLEClient dropping multiple times
taks · Sep 28, 2024 · d65147f · d65147f
2 parents f54a982 + f3e6d96
commit d65147f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/client/ble_attribute.rs b/src/client/ble_attribute.rs
@@ -1,12 +1,14 @@
-use crate::BLEClient;
+use crate::utilities::ArcUnsafeCell;
 use esp_idf_svc::sys as esp_idf_sys;
 
+use super::ble_client::BLEClientState;
+
 pub(crate) trait BLEAttribute {
-  fn get_client(&self) -> Option<BLEClient>;
+  fn get_client(&self) -> Option<ArcUnsafeCell<BLEClientState>>;
 
   fn conn_handle(&self) -> u16 {
     match self.get_client() {
-      Some(x) => x.conn_handle(),
+      Some(x) => x.conn_handle,
       None => esp_idf_sys::BLE_HS_CONN_HANDLE_NONE as _,
     }
   }

diff --git a/src/client/ble_client.rs b/src/client/ble_client.rs
@@ -12,7 +12,7 @@ use esp_idf_sys::*;
 #[allow(clippy::type_complexity)]
 pub(crate) struct BLEClientState {
   address: Option<BLEAddress>,
-  conn_handle: u16,
+  pub(crate) conn_handle: u16,
   services: Option<Vec<BLERemoteService>>,
   signal: Signal<u32>,
   connect_timeout_ms: u32,
@@ -54,10 +54,6 @@ impl BLEClient {
     }
   }
 
-  pub(crate) fn from_state(state: ArcUnsafeCell<BLEClientState>) -> Self {
-    Self { state }
-  }
-
   pub(crate) fn conn_handle(&self) -> u16 {
     self.state.conn_handle
   }

diff --git a/src/client/ble_remote_characteristic.rs b/src/client/ble_remote_characteristic.rs
@@ -1,13 +1,14 @@
 use core::borrow::Borrow;
 
+use super::ble_client::BLEClientState;
 use super::ble_remote_service::BLERemoteServiceState;
 use super::{BLEReader, BLEWriter};
+use crate::BLEAttribute;
 use crate::{
   ble,
   utilities::{as_void_ptr, voidp_to_ref, ArcUnsafeCell, BleUuid, WeakUnsafeCell},
   BLEError, BLERemoteDescriptor, Signal,
 };
-use crate::{BLEAttribute, BLEClient};
 use alloc::{boxed::Box, vec::Vec};
 use bitflags::bitflags;
 use core::ffi::c_void;
@@ -41,7 +42,7 @@ pub struct BLERemoteCharacteristicState {
 }
 
 impl BLEAttribute for BLERemoteCharacteristicState {
-  fn get_client(&self) -> Option<BLEClient> {
+  fn get_client(&self) -> Option<ArcUnsafeCell<BLEClientState>> {
     match self.service.upgrade() {
       Some(x) => x.get_client(),
       None => None,

diff --git a/src/client/ble_remote_service.rs b/src/client/ble_remote_service.rs
@@ -2,7 +2,7 @@ use super::ble_client::BLEClientState;
 use crate::{
   ble,
   utilities::{as_void_ptr, voidp_to_ref, ArcUnsafeCell, BleUuid, WeakUnsafeCell},
-  BLEAttribute, BLEClient, BLEError, BLERemoteCharacteristic, Signal,
+  BLEAttribute, BLEError, BLERemoteCharacteristic, Signal,
 };
 use alloc::vec::Vec;
 use core::ffi::c_void;
@@ -18,8 +18,8 @@ pub struct BLERemoteServiceState {
 }
 
 impl BLEAttribute for BLERemoteServiceState {
-  fn get_client(&self) -> Option<BLEClient> {
-    self.client.upgrade().map(BLEClient::from_state)
+  fn get_client(&self) -> Option<ArcUnsafeCell<BLEClientState>> {
+    self.client.upgrade()
   }
 }