enhance bonding management

- seperate bond folder for prph and central
- use mac address if couldn't get peer name when saving bond data

Author: hathach

libraries/Bluefruit52Lib/src/BLECentral.cpp

@@ -35,6 +35,7 @@
 /**************************************************************************/
 
 #include "bluefruit.h"
+#include "utility/bonding.h"
 
 /**
  * Constructor
@@ -137,6 +138,11 @@ void BLECentral::setDisconnectCallback( BLEGap::disconnect_callback_t fp)
   _disconnect_cb = fp;
 }
 
+void BLECentral::clearBonds(void)
+{
+  bond_clear_cntr();
+}
+
 /**
  * Event is forwarded from Bluefruit Poll() method
  * @param event

libraries/Bluefruit52Lib/src/BLECentral.h

@@ -71,6 +71,8 @@ class BLECentral
     bool     connected (uint16_t conn_handle); // If connected to a specific peripheral
     bool     connected (void);                 // If connected to any peripherals
 
+    void     clearBonds        (void);
+
     /*------------- Callbacks -------------*/
     void setConnectCallback   ( BLEGap::connect_callback_t    fp);
     void setDisconnectCallback( BLEGap::disconnect_callback_t fp);

libraries/Bluefruit52Lib/src/BLEGap.cpp

@@ -337,11 +337,7 @@ void BLEGap::_eventHandler(ble_evt_t* evt)
         peer->bonded = true;
         peer->ediv   = peer->bond_data->own_enc.master_id.ediv;
 
-        // TODO Skip bonding for central, implement re-establishment connection later.
-        if ( peer->role == BLE_GAP_ROLE_PERIPH )
-        {
-          bond_save_keys(conn_hdl, peer->bond_data);
-        }
+        bond_save_keys(peer->role, conn_hdl, peer->bond_data);
       }else
       {
         PRINT_HEX(status->auth_status);
@@ -361,7 +357,7 @@ void BLEGap::_eventHandler(ble_evt_t* evt)
       bond_data_t bdata;
       varclr(&bdata);
 
-      if ( bond_load_keys(sec_req->master_id.ediv, &bdata) )
+      if ( bond_load_keys(peer->role, sec_req->master_id.ediv, &bdata) )
       {
         sd_ble_gap_sec_info_reply(evt->evt.gap_evt.conn_handle, &bdata.own_enc.enc_info, &bdata.peer_id.id_info, NULL);
 
@@ -379,7 +375,7 @@ void BLEGap::_eventHandler(ble_evt_t* evt)
       // Previously bonded --> secure by re-connection process
       // --> Load & Set Sys Attr (Apply Service Context)
       // Else Init Sys Attr
-      bond_load_cccd(conn_hdl, peer->ediv);
+      bond_load_cccd(peer->role, conn_hdl, peer->ediv);
 
       // Paired is Bonded (as we always save keys)
       peer->bonded = true;

libraries/Bluefruit52Lib/src/BLEGap.h

@@ -124,7 +124,7 @@ class BLEGap
     ble_gap_sec_params_t _sec_param;
 
     friend class AdafruitBluefruit;
-    friend class BLEGatt;
+//    friend class BLEGatt;
 };
 
 #endif /* BLEGAP_H_ */

libraries/Bluefruit52Lib/src/BLEGatt.cpp

@@ -146,7 +146,8 @@ void BLEGatt::_eventHandler(ble_evt_t* evt)
         // Save CCCD if paired
         if ( Bluefruit.connPaired() && (evt_id == BLE_GATTS_EVT_WRITE) && (req_handle == chr->handles().cccd_handle) )
         {
-          bond_save_cccd(evt_conn_hdl, Bluefruit.Gap._get_peer(evt_conn_hdl)->ediv);
+          BLEGap::gap_peer_t* peer = Bluefruit.Gap._get_peer(evt_conn_hdl);
+          bond_save_cccd( peer->role, evt_conn_hdl, peer->ediv);
         }
       }
     }

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -731,34 +731,12 @@ void AdafruitBluefruit::printInfo(void)
   Serial.println();
 
   /*------------- List the paried device -------------*/
-  Serial.printf(title_fmt, "Paired Devices");
+  Serial.printf(title_fmt, "Peripheral Paired Devices\n");
+  bond_print_list(BLE_GAP_ROLE_PERIPH);
   Serial.println();
 
-  NffsDir dir(CFG_BOND_NFFS_DIR);
-  NffsDirEntry dirEntry;
-  while( dir.read(&dirEntry) )
-  {
-    if ( !dirEntry.isDirectory() )
-    {
-      char name[64];
-      dirEntry.getName(name, sizeof(name));
-
-      Serial.printf("  %s : ", name);
-
-      // open file to read device name
-      NffsFile file(CFG_BOND_NFFS_DIR, dirEntry, FS_ACCESS_READ);
-
-      varclr(name);
-
-      file.seek(BOND_FILE_DEVNAME_OFFSET);
-      if ( file.read(name, CFG_MAX_DEVNAME_LEN) )
-      {
-        Serial.println(name);
-      }
-
-      file.close();
-    }
-  }
+  Serial.printf(title_fmt, "Central Paired Devices\n");
+  bond_print_list(BLE_GAP_ROLE_CENTRAL);
   Serial.println();
 
   Serial.println();
@@ -984,6 +962,6 @@ bool AdafruitBluefruit::requestPairing(void)
 
 void AdafruitBluefruit::clearBonds(void)
 {
-  bond_clear();
+  bond_clear_prph();
 }
 

libraries/Bluefruit52Lib/src/services/BLEDfu.cpp

@@ -139,7 +139,7 @@ static void bledfu_control_wr_authorize_cb(BLECharacteristic& chr, ble_gatts_evt
       {
         bond_data_t bdata;
 
-        if ( bond_load_keys( Bluefruit.Gap._get_peer(conn_hdl)->ediv, &bdata ) )
+        if ( bond_load_keys( BLE_GAP_ROLE_PERIPH, Bluefruit.Gap._get_peer(conn_hdl)->ediv, &bdata ) )
         {
           peer_data->addr    = bdata.peer_id.id_addr_info;
           peer_data->irk     = bdata.peer_id.id_info;

libraries/Bluefruit52Lib/src/utility/bonding.cpp

@@ -42,9 +42,9 @@
 #define SVC_CONTEXT_FLAG                 (BLE_GATTS_SYS_ATTR_FLAG_SYS_SRVCS | BLE_GATTS_SYS_ATTR_FLAG_USR_SRVCS)
 
 #if CFG_DEBUG >= 2
-#define printBondDir()    dbgPrintDir(CFG_BOND_NFFS_DIR)
+#define printBondDir(role)    dbgPrintDir( role == BLE_GAP_ROLE_PERIPH ? BOND_DIR_PRPH : BOND_DIR_CNTR )
 #else
-#define printBondDir()
+#define printBondDir(role)
 #endif
 
 /*------------------------------------------------------------------*/
@@ -58,16 +58,24 @@ void bond_init(void)
 {
   // Initialize nffs for bonding (it is safe to call nffs_pkg_init() multiple time)
   Nffs.begin();
-  (void) Nffs.mkdir_p(CFG_BOND_NFFS_DIR);
+
+  (void) Nffs.mkdir_p(BOND_DIR_PRPH);
+  (void) Nffs.mkdir_p(BOND_DIR_CNTR);
 }
 
 /*------------------------------------------------------------------*/
 /* Keys
  *------------------------------------------------------------------*/
-static void bond_save_keys_dfr(uint16_t conn_hdl, bond_data_t* bdata)
+static void bond_save_keys_dfr(uint8_t role, uint16_t conn_hdl, bond_data_t* bdata)
 {
-  char filename[BOND_FILENAME_LEN];
-  sprintf(filename, BOND_FILENAME, bdata->own_enc.master_id.ediv);
+  char filename[BOND_FNAME_LEN];
+  if ( role == BLE_GAP_ROLE_PERIPH )
+  {
+    sprintf(filename, BOND_FNAME_PRPH, bdata->own_enc.master_id.ediv);
+  }else
+  {
+    sprintf(filename, BOND_FNAME_CNTR, bdata->own_enc.master_id.ediv);
+  }
 
   char devname[CFG_MAX_DEVNAME_LEN] = { 0 };
   Bluefruit.Gap.getPeerName(conn_hdl, devname, CFG_MAX_DEVNAME_LEN);
@@ -84,12 +92,15 @@ static void bond_save_keys_dfr(uint16_t conn_hdl, bond_data_t* bdata)
     result = false;
   }
 
-  // write device name
-  if ( strlen(devname) && !file.write((uint8_t*) devname, CFG_MAX_DEVNAME_LEN) )
+  // If couldn't get devname use peer mac address
+  if ( !strlen(devname) )
   {
-    result = false;
+    uint8_t* mac = bdata->peer_id.id_addr_info.addr;
+    sprintf(devname, "%02X:%02X:%02X:%02X:%02X:%02X", mac[5], mac[4], mac[3], mac[2], mac[1], mac[0]);
   }
 
+  file.write((uint8_t*) devname, CFG_MAX_DEVNAME_LEN);
+
   file.close();
 
   if (result)
@@ -100,24 +111,30 @@ static void bond_save_keys_dfr(uint16_t conn_hdl, bond_data_t* bdata)
     LOG_LV1("BOND", "Failed to save keys for \"%s\"", devname);
   }
 
-  printBondDir();
+  printBondDir(role);
 }
 
-void bond_save_keys(uint16_t conn_hdl, bond_data_t* bdata)
+void bond_save_keys(uint8_t role, uint16_t conn_hdl, bond_data_t* bdata)
 {
   uint8_t* buf = (uint8_t*) rtos_malloc( sizeof(bond_data_t) );
   VERIFY(buf, );
 
   memcpy(buf, bdata, sizeof(bond_data_t));
 
   // queue to execute in Ada Callback thread
-  ada_callback(buf, bond_save_keys_dfr, conn_hdl, buf);
+  ada_callback(buf, bond_save_keys_dfr, role, conn_hdl, buf);
 }
 
-bool bond_load_keys(uint16_t ediv, bond_data_t* bdata)
+bool bond_load_keys(uint8_t role, uint16_t ediv, bond_data_t* bdata)
 {
-  char filename[BOND_FILENAME_LEN];
-  sprintf(filename, BOND_FILENAME, ediv);
+  char filename[BOND_FNAME_LEN];
+  if ( role == BLE_GAP_ROLE_PERIPH )
+  {
+    sprintf(filename, BOND_FNAME_PRPH, ediv);
+  }else
+  {
+    sprintf(filename, BOND_FNAME_CNTR, ediv);
+  }
 
   bool result = (Nffs.readFile(filename, bdata, sizeof(bond_data_t)) > 0);
 
@@ -136,7 +153,7 @@ bool bond_load_keys(uint16_t ediv, bond_data_t* bdata)
 /*------------------------------------------------------------------*/
 /* CCCD
  *------------------------------------------------------------------*/
-static void bond_save_cccd_dfr (uint16_t conn_hdl, uint16_t ediv)
+static void bond_save_cccd_dfr (uint8_t role, uint16_t conn_hdl, uint16_t ediv)
 {
   uint16_t len=0;
   sd_ble_gatts_sys_attr_get(conn_hdl, NULL, &len, SVC_CONTEXT_FLAG);
@@ -147,8 +164,14 @@ static void bond_save_cccd_dfr (uint16_t conn_hdl, uint16_t ediv)
   if ( ERROR_NONE == sd_ble_gatts_sys_attr_get(conn_hdl, sys_attr, &len, SVC_CONTEXT_FLAG) )
   {
     // save to file
-    char filename[BOND_FILENAME_LEN];
-    sprintf(filename, BOND_FILENAME, ediv);
+    char filename[BOND_FNAME_LEN];
+    if ( role == BLE_GAP_ROLE_PERIPH )
+    {
+      sprintf(filename, BOND_FNAME_PRPH, ediv);
+    }else
+    {
+      sprintf(filename, BOND_FNAME_CNTR, ediv);
+    }
 
     if ( Nffs.writeFile(filename, sys_attr, len, BOND_FILE_CCCD_OFFSET) )
     {
@@ -161,24 +184,30 @@ static void bond_save_cccd_dfr (uint16_t conn_hdl, uint16_t ediv)
   }
 
   rtos_free(sys_attr);
-  printBondDir();
+  printBondDir(role);
 }
 
-void bond_save_cccd(uint16_t cond_hdl, uint16_t ediv)
+void bond_save_cccd(uint8_t role, uint16_t cond_hdl, uint16_t ediv)
 {
   VERIFY( ediv != 0xFFFF, );
 
   // queue to execute in Ada Callback thread
-  ada_callback(NULL, bond_save_cccd_dfr, cond_hdl, ediv);
+  ada_callback(NULL, bond_save_cccd_dfr, role, cond_hdl, ediv);
 }
 
 
-bool bond_load_cccd(uint16_t cond_hdl, uint16_t ediv)
+bool bond_load_cccd(uint8_t role, uint16_t cond_hdl, uint16_t ediv)
 {
   bool loaded = false;
 
-  char filename[BOND_FILENAME_LEN];
-  sprintf(filename, BOND_FILENAME, ediv);
+  char filename[BOND_FNAME_LEN];
+  if ( role == BLE_GAP_ROLE_PERIPH )
+  {
+    sprintf(filename, BOND_FNAME_PRPH, ediv);
+  }else
+  {
+    sprintf(filename, BOND_FNAME_CNTR, ediv);
+  }
 
   NffsFile file(filename, FS_ACCESS_READ);
 
@@ -222,16 +251,68 @@ bool bond_load_cccd(uint16_t cond_hdl, uint16_t ediv)
   return loaded;
 }
 
+void bond_print_list(uint8_t role)
+{
+  const char* dpath = (role == BLE_GAP_ROLE_PERIPH ? BOND_DIR_PRPH : BOND_DIR_CNTR);
+
+  NffsDir dir(dpath);
+  NffsDirEntry dirEntry;
+
+  while( dir.read(&dirEntry) )
+  {
+    if ( !dirEntry.isDirectory() )
+    {
+      char name[64];
+      dirEntry.getName(name, sizeof(name));
+
+      cprintf("  %s : ", name);
+
+      // open file to read device name
+      NffsFile file(dpath, dirEntry, FS_ACCESS_READ);
+
+      varclr(name);
+
+      file.seek(BOND_FILE_DEVNAME_OFFSET);
+      if ( file.read(name, CFG_MAX_DEVNAME_LEN) )
+      {
+        cprintf(name);
+      }
+
+      cprintf("\n");
+      file.close();
+    }
+  }
+  cprintf("\n");
+}
+
 /*------------------------------------------------------------------*/
 /* DELETE
  *------------------------------------------------------------------*/
-void bond_clear(void)
+void bond_clear_prph(void)
 {
   // Detele bonds dir
-  Nffs.remove(CFG_BOND_NFFS_DIR);
+  Nffs.remove(BOND_DIR_PRPH);
 
   // Create an empty one
-  Nffs.mkdir_p(CFG_BOND_NFFS_DIR);
+  (void) Nffs.mkdir_p(BOND_DIR_PRPH);
+}
+
+void bond_clear_cntr(void)
+{
+  // Detele bonds dir
+  Nffs.remove(BOND_DIR_CNTR);
+
+  // Create an empty one
+  (void) Nffs.mkdir_p(BOND_DIR_CNTR);
+}
+
+
+void bond_clear_all(void)
+{
+  // Detele bonds dir
+  Nffs.remove(BOND_DIR_ROOT);
 
-  printBondDir();
+  // Create an empty one for prph and central
+  (void) Nffs.mkdir_p(BOND_DIR_PRPH);
+  (void) Nffs.mkdir_p(BOND_DIR_CNTR);
 }