Retain characteristic handles

MillerTechnologyPeru · Nov 24, 2024 · 6d39890 · 6d39890
1 parent 302df2b
commit 6d39890
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Sources/NimBLE/GATTServer.swift b/Sources/NimBLE/GATTServer.swift
@@ -28,6 +28,8 @@ public struct GATTServer {
 
         var buffers = [[UInt8]]()
 
+        var characteristicValueHandles = [[UInt16]]()
+
         /// Callback to handle GATT read requests.
         var willRead: ((GATTReadRequest<Central, [UInt8]>) -> ATTError?)?
 
@@ -128,6 +130,7 @@ public struct GATTServer {
         self.context.pointee.gattServer.characteristicsBuffers = characteristicsBuffers
         self.context.pointee.gattServer.buffers = buffers
         self.context.pointee.gattServer.services = services
+        self.context.pointee.gattServer.characteristicValueHandles = valueHandles
         // get handles
         return valueHandles
     }
@@ -140,10 +143,11 @@ public struct GATTServer {
     /// Clears the local GATT database.
     public func removeAllServices() {
         ble_gatts_reset()
-        self.context.pointee.gattServer.services.removeAll()
+        self.context.pointee.gattServer.services.removeAll(keepingCapacity: false)
         self.context.pointee.gattServer.buffers.removeAll(keepingCapacity: false)
         self.context.pointee.gattServer.services.removeAll(keepingCapacity: false)
         self.context.pointee.gattServer.characteristicsBuffers.removeAll(keepingCapacity: false)
+        self.context.pointee.gattServer.characteristicValueHandles.removeAll(keepingCapacity: false)
     }
 
     public func dump() {
@@ -205,5 +209,5 @@ internal func _ble_gatt_access(
     default:
         break
     }
-    return BLE_ATT_ERR_UNLIKELY
+    return 0
 }
diff --git a/Tests/NimBLETests/GATTServerTests.swift b/Tests/NimBLETests/GATTServerTests.swift
@@ -40,5 +40,6 @@ struct GATTServerTests {
       }
       server.dump()
       #expect(handles[0][0] == 0x03)
+      #expect(server.context.pointee.gattServer.characteristic(for: 0x03)?.uuid == .manufacturerNameString)
   }
 }