From ce1e26281b4c227595d88d15671f4d2cd13248f2 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 31 Jul 2015 16:59:07 +0200
Subject: [PATCH] make address resolution/identify resolving public

---
 ble/sm.c | 30 +++++++++++++++++++++---------
 ble/sm.h | 12 ++++++++++++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ble/sm.c b/ble/sm.c
index 815f75e42..fb44598a0 100644
--- a/ble/sm.c
+++ b/ble/sm.c
@@ -538,9 +538,6 @@ static void sm_setup_key_distribution(uint8_t key_set){
 
 // CSRK Key Lookup
 
-/* static */ int sm_address_resolution_lookup_active(void){
-    return sm_address_resolution_test >= 0;
-}
 
 static void sm_address_resolution_start_lookup(uint8_t addr_type, bd_addr_t addr, void * context){
     memcpy(sm_address_resolution_address, addr, 6);
@@ -551,6 +548,14 @@ static void sm_address_resolution_start_lookup(uint8_t addr_type, bd_addr_t addr
     sm_notify_client(SM_IDENTITY_RESOLVING_STARTED, addr_type, addr, 0, 0);
 }
 
+void sm_address_resolution_lookup(uint8_t addr_type, bd_addr_t addr){
+    sm_address_resolution_start_lookup(addr_type, addr, NULL);
+}
+
+int sm_address_resolution_idle(void){
+    return sm_address_resolution_test < 0;
+}
+
 // CMAC Implementation using AES128 engine
 static void sm_shift_left_by_one_bit_inplace(int len, uint8_t * data){
     int i;
@@ -926,7 +931,7 @@ static void sm_run(void){
 
     // CSRK Lookup
     // -- if csrk lookup ready, find connection that require csrk lookup
-    if (!sm_address_resolution_lookup_active()){
+    if (sm_address_resolution_idle()){
         hci_connections_get_iterator(&it);
         while(linked_list_iterator_has_next(&it)){
             hci_connection_t * hci_connection = (hci_connection_t *) linked_list_iterator_next(&it);
@@ -943,7 +948,6 @@ static void sm_run(void){
     // -- Continue with CSRK device lookup by public or resolvable private address
     if (sm_address_resolution_test >= 0){
         log_info("LE Device Lookup: device %u/%u", sm_address_resolution_test, le_device_db_count());
-        sm_connection_t * sm_csrk_connection = (sm_connection_t *) sm_address_resolution_context;
         while (sm_address_resolution_test < le_device_db_count()){
             int addr_type;
             bd_addr_t addr;
@@ -953,10 +957,15 @@ static void sm_run(void){
 
             if (sm_address_resolution_addr_type == addr_type && memcmp(addr, sm_address_resolution_address, 6) == 0){
                 log_info("LE Device Lookup: found CSRK by { addr_type, address} ");
+                sm_connection_t * sm_csrk_connection = (sm_connection_t *) sm_address_resolution_context;
+                sm_address_resolution_context = NULL;
                 sm_address_resolution_matched = sm_address_resolution_test;
                 sm_address_resolution_test = -1;
                 sm_notify_client(SM_IDENTITY_RESOLVING_SUCCEEDED, sm_address_resolution_addr_type, sm_address_resolution_address, 0, sm_address_resolution_matched);
 
+                // if context given, we're resolving an active connection
+                if (!sm_csrk_connection) break;
+
                 // re-use stored LTK/EDIV/RAND if requested & we're master
                 // TODO: replace global with flag in sm_connection_t
                 if (sm_authenticate_outgoing_connections && sm_csrk_connection->sm_role == 0){
@@ -966,7 +975,6 @@ static void sm_run(void){
 
                 // ready for other requests
                 sm_csrk_connection->sm_csrk_lookup_state = CSRK_LOOKUP_IDLE;
-                sm_csrk_connection = NULL;
                 break;
             }
 
@@ -983,16 +991,20 @@ static void sm_run(void){
             sm_key_t r_prime;
             sm_ah_r_prime(sm_address_resolution_address, r_prime);
             sm_address_resolution_ah_calculation_active = 1;
-            sm_aes128_start(irk, r_prime, sm_csrk_connection);
+            sm_aes128_start(irk, r_prime, sm_address_resolution_context);   // keep context
             return;
         }
 
         if (sm_address_resolution_test >= le_device_db_count()){
             log_info("LE Device Lookup: not found");
+            sm_connection_t * sm_csrk_connection = (sm_connection_t *) sm_address_resolution_context;
+            sm_address_resolution_context = NULL;
             sm_address_resolution_test = -1;
-            sm_csrk_connection->sm_csrk_lookup_state = CSRK_LOOKUP_IDLE;
-            sm_csrk_connection = NULL;
             sm_notify_client(SM_IDENTITY_RESOLVING_FAILED, sm_address_resolution_addr_type, sm_address_resolution_address, 0, 0);
+
+            if (sm_address_resolution_context) {
+                sm_csrk_connection->sm_csrk_lookup_state = CSRK_LOOKUP_IDLE;
+            }
         }
     }
 
diff --git a/ble/sm.h b/ble/sm.h
index e0ec5b0a3..699081caa 100644
--- a/ble/sm.h
+++ b/ble/sm.h
@@ -256,6 +256,18 @@ void sm_authorization_grant(uint8_t addr_type, bd_addr_t address);
 int  sm_cmac_ready(void);
 void sm_cmac_start(sm_key_t k, uint16_t message_len, uint8_t * message, uint32_t sign_counter, void (*done_handler)(uint8_t hash[8]));
 
+/**
+ * @brief Address Resolution Engine idle
+ * @return 1 if idle, 0 otherwise
+ */
+int sm_address_resolution_idle(void);
+
+/*
+ * @brief Match address against bonded devices
+ * @note Triggers SM_IDENTITY_RESOLVING_* events
+ */
+ void sm_address_resolution_lookup(uint8_t addr_type, bd_addr_t addr);
+
 /**
  * @brief Identify device in LE Device DB.
  * @param handle