From 3d39b222179d8ea2f8e981a90eb998da53a12320 Mon Sep 17 00:00:00 2001
From: Neil Kolban <kolban1@kolban.com>
Date: Sun, 17 Dec 2017 23:13:13 -0600
Subject: [PATCH] Code changes for #291

---
 cpp_utils/BLEAdvertising.cpp | 31 +++++++++++++++++++++++++++++++
 cpp_utils/BLEAdvertising.h   |  1 +
 cpp_utils/BLEDevice.cpp      | 28 ++++++++++++++++++++++++++++
 cpp_utils/BLEDevice.h        |  2 ++
 4 files changed, 62 insertions(+)

diff --git a/cpp_utils/BLEAdvertising.cpp b/cpp_utils/BLEAdvertising.cpp
index 6331fa10..d7b20bb6 100644
--- a/cpp_utils/BLEAdvertising.cpp
+++ b/cpp_utils/BLEAdvertising.cpp
@@ -92,6 +92,36 @@ void BLEAdvertising::setAppearance(uint16_t appearance) {
 } // setAppearance
 
 
+/**
+ * @brief Set the filtering for the scan filter.
+ * @param [in] scanRequestWhitelistOnly If true, only allow scan requests from those on the white list.
+ * @param [in] connectWhitelistOnly If true, only allow connections from those on the white list.
+ */
+void BLEAdvertising::setScanFilter(bool scanRequestWhitelistOnly,	bool connectWhitelistOnly) {
+	ESP_LOGD(LOG_TAG, ">> setScanFilter: scanRequestWhitelistOnly: %d, connectWhitelistOnly: %d", scanRequestWhitelistOnly, connectWhitelistOnly);
+	if (!scanRequestWhitelistOnly && !connectWhitelistOnly) {
+		m_advParams.adv_filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY;
+		ESP_LOGD(LOG_TAG, "<< setScanFilter");
+		return;
+	}
+	if (scanRequestWhitelistOnly && !connectWhitelistOnly) {
+		m_advParams.adv_filter_policy = ADV_FILTER_ALLOW_SCAN_WLST_CON_ANY;
+		ESP_LOGD(LOG_TAG, "<< setScanFilter");
+		return;
+	}
+	if (!scanRequestWhitelistOnly && connectWhitelistOnly) {
+		m_advParams.adv_filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_WLST;
+		ESP_LOGD(LOG_TAG, "<< setScanFilter");
+		return;
+	}
+	if (scanRequestWhitelistOnly && connectWhitelistOnly) {
+		m_advParams.adv_filter_policy = ADV_FILTER_ALLOW_SCAN_WLST_CON_WLST;
+		ESP_LOGD(LOG_TAG, "<< setScanFilter");
+		return;
+	}
+} // setScanFilter
+
+
 /**
  * @brief Set the advertisement data that is to be published in a regular advertisement.
  * @param [in] advertisementData The data to be advertised.
@@ -417,4 +447,5 @@ void BLEBeacon::setSignalPower(uint16_t signalPower) {
 } // setSignalPower
 
 
+
 #endif /* CONFIG_BT_ENABLED */
diff --git a/cpp_utils/BLEAdvertising.h b/cpp_utils/BLEAdvertising.h
index 1965227d..04f5924d 100644
--- a/cpp_utils/BLEAdvertising.h
+++ b/cpp_utils/BLEAdvertising.h
@@ -80,6 +80,7 @@ class BLEAdvertising {
 	void stop();
 	void setAppearance(uint16_t appearance);
 	void setAdvertisementData(BLEAdvertisementData& advertisementData);
+	void setScanFilter(bool scanRequertWhitelistOnly, bool connectWhitelistOnly);
 	void setScanResponseData(BLEAdvertisementData& advertisementData);
 
 private:
diff --git a/cpp_utils/BLEDevice.cpp b/cpp_utils/BLEDevice.cpp
index b89711a1..5e09069d 100644
--- a/cpp_utils/BLEDevice.cpp
+++ b/cpp_utils/BLEDevice.cpp
@@ -337,4 +337,32 @@ bool       initialized          = false;   // Have we been initialized?
 	return oss.str();
 } // toString
 
+
+/**
+ * @brief Add an entry to the BLE white list.
+ * @param [in] address The address to add to the white list.
+ */
+void BLEDevice::whiteListAdd(BLEAddress address) {
+	ESP_LOGD(LOG_TAG, ">> whiteListAdd: %s", address.toString().c_str());
+	esp_err_t errRc = esp_ble_gap_update_whitelist(true, *address.getNative());  // True to add an entry.
+	if (errRc != ESP_OK) {
+		ESP_LOGE(LOG_TAG, "esp_ble_gap_update_whitelist: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
+	}
+	ESP_LOGD(LOG_TAG, "<< whiteListAdd");
+} // whiteListAdd
+
+
+/**
+ * @brief Remove an entry from the BLE white list.
+ * @param [in] address The address to remove from the white list.
+ */
+void BLEDevice::whiteListRemove(BLEAddress address) {
+	ESP_LOGD(LOG_TAG, ">> whiteListRemove: %s", address.toString().c_str());
+	esp_err_t errRc = esp_ble_gap_update_whitelist(false, *address.getNative());  // False to remove an entry.
+	if (errRc != ESP_OK) {
+		ESP_LOGE(LOG_TAG, "esp_ble_gap_update_whitelist: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
+	}
+	ESP_LOGD(LOG_TAG, "<< whiteListRemove");
+} // whiteListRemove
+
 #endif // CONFIG_BT_ENABLED
diff --git a/cpp_utils/BLEDevice.h b/cpp_utils/BLEDevice.h
index ecf5e6c7..c6383720 100644
--- a/cpp_utils/BLEDevice.h
+++ b/cpp_utils/BLEDevice.h
@@ -36,6 +36,8 @@ class BLEDevice {
 	static void        setPower(esp_power_level_t powerLevel);  // Set our power level.
 	static void        setValue(BLEAddress bdAddress, BLEUUID serviceUUID, BLEUUID characteristicUUID, std::string value);   // Set the value of a characteristic on a service on a server.
 	static std::string toString();        // Return a string representation of our device.
+	static void        whiteListAdd(BLEAddress address);    // Add an entry to the BLE white list.
+	static void        whiteListRemove(BLEAddress address); // Remove an entry from the BLE white list.
 
 private:
 	static BLEServer *m_pServer;