GIT#370 Add scan response support for central role

Resolved conflicts:
	libraries/CurieBLE/src/internal/BLEDeviceManager.cpp

Author: sgbihu

libraries/CurieBLE/src/internal/BLEDeviceManager.cpp

@@ -698,6 +698,7 @@ bool BLEDeviceManager::getDataFromAdvertiseByType(const BLEDevice* device,
     return retval;
 }
 
+
 bool BLEDeviceManager::hasLocalName(const BLEDevice* device) const
 {
     if (BLEUtils::isLocalBLE(*device) == true)
@@ -707,40 +708,18 @@ bool BLEDeviceManager::hasLocalName(const BLEDevice* device) const
 
     const uint8_t* local_name = NULL;
     uint8_t local_name_len = 0;
-    return getDataFromAdvertiseByType(device, 
-                                      BT_DATA_NAME_COMPLETE,
-                                      local_name, 
-                                      local_name_len);
-    /*
-    getDeviceAdvertiseBuffer(device->bt_le_address(),
-                             adv_data,
-                             adv_data_len);
-    if (NULL == adv_data)
-    {
-        return false;
-    }
-    
-    while (adv_data_len > 1)
+    bool retval = getDataFromAdvertiseByType(device, 
+                                             BT_DATA_NAME_COMPLETE,
+                                             local_name, 
+                                             local_name_len);
+    if (false == retval)
     {
-        uint8_t len = adv_data[0];
-        uint8_t type = adv_data[1];
-
-        // Check for early termination 
-        if (len == 0 || ((len + 1) > adv_data_len))
-        {
-            return false;
-        }
-
-        if (type == BT_DATA_NAME_COMPLETE)
-        {
-            return true;
-        }
-
-        adv_data_len -= len + 1;
-        adv_data += len + 1;
+        retval = getDataFromAdvertiseByType(device, 
+                                            BT_DATA_NAME_SHORTENED,
+                                            local_name, 
+                                            local_name_len);
     }
-    return false;
-    */
+    return retval;
 }
 
 bool BLEDeviceManager::hasAdvertisedServiceUuid(const BLEDevice* device) const

libraries/CurieBLE/src/internal/BLEDeviceManager.h

@@ -376,6 +376,16 @@ class BLEDeviceManager
 
     void updateDuplicateFilter(const bt_addr_le_t* addr);    
     bool deviceInDuplicateFilterBuffer(const bt_addr_le_t* addr);
+    void advertiseAcceptHandler(const bt_addr_le_t *addr, 
+                                int8_t rssi, 
+                                uint8_t type,
+                                const uint8_t *ad, 
+                                uint8_t data_len);
+    void setTempAdvertiseBuffer(const bt_addr_le_t* bt_addr, 
+                                int8_t rssi, 
+                                const uint8_t *ad, 
+                                uint8_t data_len);
+    uint8_t getTempAdvertiseIndexFromBuffer(const bt_addr_le_t* bt_addr);
 
     void advertiseAcceptHandler(const bt_addr_le_t *addr, 
                                 int8_t rssi,