diff options
Diffstat (limited to 'api/direct_bt')
| -rw-r--r-- | api/direct_bt/DBTAdapter.hpp | 2 | ||||
| -rw-r--r-- | api/direct_bt/DBTDevice.hpp | 1 | ||||
| -rw-r--r-- | api/direct_bt/HCIHandler.hpp | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/api/direct_bt/DBTAdapter.hpp b/api/direct_bt/DBTAdapter.hpp index 9c0163d5..35081820 100644 --- a/api/direct_bt/DBTAdapter.hpp +++ b/api/direct_bt/DBTAdapter.hpp @@ -254,7 +254,7 @@ namespace direct_bt { bool mgmtEvDeviceDiscoveringAny(std::shared_ptr<MgmtEvent> e, const bool hciSourced) noexcept; - bool smpSecurityReqCallback(const EUI48& address, BDAddressType addressType, uint16_t handle, std::shared_ptr<const SMPPDUMsg> msg) noexcept; + bool hciSMPMsgCallback(const EUI48& address, BDAddressType addressType, uint16_t handle, std::shared_ptr<const SMPPDUMsg> msg) noexcept; void startDiscoveryBackground() noexcept; void checkDiscoveryState() noexcept; diff --git a/api/direct_bt/DBTDevice.hpp b/api/direct_bt/DBTDevice.hpp index 74572bb7..790522db 100644 --- a/api/direct_bt/DBTDevice.hpp +++ b/api/direct_bt/DBTDevice.hpp @@ -94,6 +94,7 @@ namespace direct_bt { void notifyDisconnected() noexcept; void notifyConnected(const uint16_t handle) noexcept; + void notifySMPMsg(std::shared_ptr<const SMPPDUMsg> msg) noexcept; /** * Returns a newly established GATT connection. diff --git a/api/direct_bt/HCIHandler.hpp b/api/direct_bt/HCIHandler.hpp index ee94de19..aed5ee08 100644 --- a/api/direct_bt/HCIHandler.hpp +++ b/api/direct_bt/HCIHandler.hpp @@ -148,8 +148,8 @@ namespace direct_bt { }; typedef jau::FunctionDef<bool, const EUI48& /* address */, BDAddressType /* addressType */, - uint16_t /* handle */, std::shared_ptr<const SMPPDUMsg>> HCISMPSecurityReqCallback; - typedef jau::cow_vector<HCISMPSecurityReqCallback> HCISMPSecurityReqCallbackList; + uint16_t /* connectionHandle */, std::shared_ptr<const SMPPDUMsg>> HCISMPMsgCallback; + typedef jau::cow_vector<HCISMPMsgCallback> HCISMPMsgCallbackList; /** * A thread safe singleton handler of the HCI control channel to one controller (BT adapter) @@ -301,7 +301,7 @@ namespace direct_bt { return static_cast<uint16_t>(opc) < mgmtEventCallbackLists.size(); } - HCISMPSecurityReqCallbackList smpSecurityReqCallbackList; + HCISMPMsgCallbackList hciSMPMsgCallbackList; std::shared_ptr<MgmtEvent> translate(std::shared_ptr<HCIEvent> ev) noexcept; @@ -546,8 +546,8 @@ namespace direct_bt { /** Removes all MgmtEventCallbacks from the to the named MgmtEvent::Opcode list. */ void clearMgmtEventCallbacks(const MgmtEvent::Opcode opc) noexcept; - void addSMPSecurityReqCallback(const HCISMPSecurityReqCallback & l); - int removeSMPSecurityReqCallback(const HCISMPSecurityReqCallback & l); + void addSMPMsgCallback(const HCISMPMsgCallback & l); + int removeSMPMsgCallback(const HCISMPMsgCallback & l); /** Removes all MgmtEventCallbacks from all MgmtEvent::Opcode lists and all SMPSecurityReqCallbacks. */ void clearAllCallbacks() noexcept; |