aboutsummaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-11-23 14:53:46 +0100
committerSven Gothel <[email protected]>2020-11-23 14:53:46 +0100
commita81f86b68a52ae770b121ae3c167e1e139cfba91 (patch)
treea00c9914e2ccccfac64cc60d8c79d9d554a9beb8 /api
parent40d349c24110e23b50434ca1d97ab6dded42867f (diff)
L2CAPComm: Optionally set BTSecurityLevel @ open after bind, before connect; Set BTSecurityLevel is > UNSET, adjust SMPHandler API
TODO: 'set BTSecurityLevel @ open after bind, before connect': Analyze security callback behavior in DBTDevice::processL2CAPSetup()
Diffstat (limited to 'api')
-rw-r--r--api/direct_bt/L2CAPComm.hpp20
-rw-r--r--api/direct_bt/SMPHandler.hpp6
2 files changed, 19 insertions, 7 deletions
diff --git a/api/direct_bt/L2CAPComm.hpp b/api/direct_bt/L2CAPComm.hpp
index 879c8247..9ff2f069 100644
--- a/api/direct_bt/L2CAPComm.hpp
+++ b/api/direct_bt/L2CAPComm.hpp
@@ -142,6 +142,9 @@ namespace direct_bt {
std::atomic<pthread_t> tid_connect;
std::atomic<pthread_t> tid_read;
+ bool setBTSecurityLevelImpl(const BTSecurityLevel sec_level);
+ bool getBTSecurityLevelImpl(BTSecurityLevel& sec_level);
+
public:
/**
* Constructing a non connected L2CAP channel instance for the pre-defined PSM and CID.
@@ -161,9 +164,10 @@ namespace direct_bt {
* </p>
*
* @param device the remote device to establish this L2CAP connection
+ * @param sec_level sec_level < BTSecurityLevel::NONE will not set security level
* @return true if connection has been established, otherwise false
*/
- bool open(const DBTDevice& device);
+ bool open(const DBTDevice& device, const BTSecurityLevel sec_level=BTSecurityLevel::NONE);
bool isOpen() const { return is_open; }
@@ -180,16 +184,24 @@ namespace direct_bt {
std::recursive_mutex & mutex_write() { return mtx_write; }
/**
- * If sec_level > BTSecurityLevel::NONE, sets the BlueZ's L2CAP socket BT_SECURITY sec_level, determining the SMP security mode per connection.
+ * If sec_level > BTSecurityLevel::UNSET, sets the BlueZ's L2CAP socket BT_SECURITY sec_level, determining the SMP security mode per connection.
* <p>
* To unset security, the L2CAP socket should be closed and opened again.
* </p>
*
- * @param sec_level sec_level <= BTSecurityLevel::NONE will not set security level and returns false.
- * @return true if a security level > BTSecurityLevel::NONE has been set successfully, false if no security level has been set or if it failed.
+ * @param sec_level sec_level < BTSecurityLevel::NONE will not set security level and returns false.
+ * @return true if a security level > BTSecurityLevel::UNSET has been set successfully, false if no security level has been set or if it failed.
*/
bool setBTSecurityLevel(const BTSecurityLevel sec_level);
+ /**
+ * Fetches the current BlueZ's L2CAP socket BT_SECURITY sec_level.
+ *
+ * @param sec_level return value reference written to if method returns true
+ * @return true if successful with result written to sec_level, otherwise false.
+ */
+ bool getBTSecurityLevel(BTSecurityLevel& sec_level);
+
/** Generic read, w/o locking suitable for a unique ringbuffer sink. Using L2CAPEnv::L2CAP_READER_POLL_TIMEOUT.*/
jau::snsize_t read(uint8_t* buffer, const jau::nsize_t capacity);
diff --git a/api/direct_bt/SMPHandler.hpp b/api/direct_bt/SMPHandler.hpp
index 6f16eaae..891547ea 100644
--- a/api/direct_bt/SMPHandler.hpp
+++ b/api/direct_bt/SMPHandler.hpp
@@ -216,10 +216,10 @@ namespace direct_bt {
std::string getStateString() const noexcept { return L2CAPComm::getStateString(is_connected, has_ioerror); }
/**
- * If sec_level > BTSecurityLevel::NONE, establish security level per L2CAP connection.
+ * If sec_level > BTSecurityLevel::UNSET, change security level per L2CAP connection.
*
- * @param sec_level sec_level <= BTSecurityLevel::NONE will not set security level and returns false.
- * @return true if a security level > BTSecurityLevel::NONE has been set successfully, false if no security level has been set or if it failed.
+ * @param sec_level sec_level < BTSecurityLevel::NONE will not set security level and returns false.
+ * @return true if a security level > BTSecurityLevel::UNSET has been set successfully, false if no security level has been set or if it failed.
*/
bool establishSecurity(const BTSecurityLevel sec_level);