BLEConnection add _bonded, rename _paired to _secured

Author: hathach

libraries/Bluefruit52Lib/src/BLEConnection.cpp

@@ -55,7 +55,7 @@ BLEConnection::BLEConnection(uint16_t conn_hdl, ble_gap_evt_connected_t const* e
   _hvn_sem   = xSemaphoreCreateCounting(hvn_qsize, hvn_qsize);
   _wrcmd_sem = xSemaphoreCreateCounting(wrcmd_qsize, wrcmd_qsize);
 
-  _paired = false;
+  _secured = false;
   _hvc_sem = NULL;
   _hvc_received = false;
   _pair_sem = NULL;
@@ -85,7 +85,12 @@ bool BLEConnection::connected(void)
 
 bool BLEConnection::paired (void)
 {
-  return _paired;
+  return _secured;
+}
+
+bool BLEConnection::bonded(void)
+{
+  return _bonded;
 }
 
 uint8_t BLEConnection::getRole (void)
@@ -236,50 +241,52 @@ bool BLEConnection::saveLongTermKey(bond_keys_t const* ltkey)
 {
   bond_save_keys(_role, _conn_hdl, ltkey);
   _bond_id_addr = ltkey->peer_id.id_addr_info;
-  _paired = true; // paired with new device
+  _secured = true; // paired with new device
+  _bonded = true;
   return true;
 }
 
 bool BLEConnection::loadLongTermKey(bond_keys_t* ltkey)
 {
-  VERIFY( bond_load_keys(_role, &_peer_addr, ltkey) );
+  _bonded = bond_load_keys(_role, &_peer_addr, ltkey);
+  VERIFY(_bonded);
   _bond_id_addr = ltkey->peer_id.id_addr_info;
   return true;
 }
 
 bool BLEConnection::requestPairing(void)
 {
   // skip if already paired
-  if ( _paired ) return true;
+  if ( _secured ) return true;
 
   BLEPairing* secure = &Bluefruit.Pairing;
 
   // on-the-fly semaphore
   _pair_sem = xSemaphoreCreateBinary();
   VERIFY(_pair_sem);
 
-  bond_keys_t ltkey;
-
-  if ( loadLongTermKey(&ltkey) )
-  {
-    // We already bonded with this peer previously
-    // Encrypt the connection using stored Longterm Key
-    if ( secure->_encrypt(_conn_hdl, &ltkey) )
-    {
-      xSemaphoreTake(_pair_sem, portMAX_DELAY);
-
-      // Failed to pair using stored key, this happens when peer
-      // delete bonds while we did not --> let's remove the obsolete keyfile and retry
-      if ( !_paired )
-      {
-        bond_remove_key(_role, &ltkey.peer_id.id_addr_info);
-
-        // Re-try with a fresh session
-        secure->_authenticate(_conn_hdl);
-        xSemaphoreTake(_pair_sem, portMAX_DELAY);
-      }
-    }
-  }else
+//  bond_keys_t ltkey;
+//
+//  if ( loadLongTermKey(&ltkey) ) // central only
+//  {
+//    // We already bonded with this peer previously
+//    // Encrypt the connection using stored Longterm Key
+//    if ( secure->_encrypt(_conn_hdl, &ltkey) )
+//    {
+//      xSemaphoreTake(_pair_sem, portMAX_DELAY);
+//
+//      // Failed to pair using stored key, this happens when peer
+//      // delete bonds while we did not --> let's remove the obsolete keyfile and retry
+//      if ( !_paired )
+//      {
+//        bond_remove_key(_role, &ltkey.peer_id.id_addr_info);
+//
+//        // Re-try with a fresh session
+//        secure->_authenticate(_conn_hdl);
+//        xSemaphoreTake(_pair_sem, portMAX_DELAY);
+//      }
+//    }
+//  }else
   {
     // start a fresh new authentication process
     secure->_authenticate(_conn_hdl);
@@ -289,7 +296,7 @@ bool BLEConnection::requestPairing(void)
   vSemaphoreDelete(_pair_sem);
   _pair_sem = NULL;
 
-  return _paired;
+  return _secured;
 }
 
 bool BLEConnection::waitForIndicateConfirm(void)
@@ -324,7 +331,7 @@ void BLEConnection::_eventHandler(ble_evt_t* evt)
       // Connection is secured (paired) if encryption level > 1
       if ( !( conn_sec->sec_mode.sm == 1 && conn_sec->sec_mode.lv == 1) )
       {
-        _paired = true;
+        _secured = true;
 
         // Try to restore CCCD with bonded peer, if it doesn't exist (newly bonded), initialize it
         if ( !loadCccd() )  sd_ble_gatts_sys_attr_set(_conn_hdl, NULL, 0, 0);

libraries/Bluefruit52Lib/src/BLEConnection.h

@@ -54,7 +54,8 @@ class BLEConnection
     uint16_t _ediv;
 
     bool _connected;
-    bool _paired;
+    bool _secured;
+    bool _bonded; // have LTK stored in InternalFS
     bool _hvc_received;
 
     ble_gap_addr_t _peer_addr; // resolvable connect address
@@ -74,6 +75,7 @@ class BLEConnection
     uint16_t handle(void);
     bool     connected(void);
     bool     paired(void);
+    bool     bonded(void);
 
     uint8_t  getRole(void);
     uint16_t getMtu (void);