feedc0de/esp-nimble-cpp
1
0
Fork 0
forked from h2zero/esp-nimble-cpp
Code Pull Requests Activity

[BREAKING] - Remove ignore list.

Browse Source 
This removes the ignore list feature as it can be implemented by the application if desired.
The scan will now ignore any device we are connected to already by checking for any connected client with the same peer address.
This commit is contained in:
h2zero
2024-11-23 21:08:08 -07:00
committed by h2zero
parent 2151386057
commit 1b0abd273f
5 changed files with 6 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NimBLEDevice.cpp
-44
View File
@@ -97,7 +97,6 @@ bool NimBLEDevice::m_initialized{false};
uint32_t NimBLEDevice::m_passkey{123456};
bool NimBLEDevice::m_synced{false};
ble_gap_event_listener NimBLEDevice::m_listener{};
std::vector<NimBLEAddress> NimBLEDevice::m_ignoreList{};
std::vector<NimBLEAddress> NimBLEDevice::m_whiteList{};
uint8_t NimBLEDevice::m_ownAddrType{BLE_OWN_ADDR_PUBLIC};
@@ -928,7 +927,6 @@ bool NimBLEDevice::deinit(bool clearAll) {
deleteClient(clt);
}
# endif
m_ignoreList.clear();
}
return rc == 0;
@@ -1149,48 +1147,6 @@ bool NimBLEDevice::injectConfirmPasskey(const NimBLEConnInfo& peerInfo, bool acc
return rc == 0;
}
/* -------------------------------------------------------------------------- */
/* IGNORE LIST */
/* -------------------------------------------------------------------------- */
/**
* @brief Check if the device address is on our ignore list.
* @param [in] address The address to look for.
* @return True if ignoring.
*/
bool NimBLEDevice::isIgnored(const NimBLEAddress& address) {
for (const auto& addr : m_ignoreList) {
if (addr == address) {
return true;
}
}
return false;
}
/**
* @brief Add a device to the ignore list.
* @param [in] address The address of the device we want to ignore.
*/
void NimBLEDevice::addIgnored(const NimBLEAddress& address) {
if (!isIgnored(address)) {
m_ignoreList.push_back(address);
}
}
/**
* @brief Remove a device from the ignore list.
* @param [in] address The address of the device we want to remove from the list.
*/
void NimBLEDevice::removeIgnored(const NimBLEAddress& address) {
for (auto it = m_ignoreList.begin(); it < m_ignoreList.end(); ++it) {
if (*it == address) {
m_ignoreList.erase(it);
std::vector<NimBLEAddress>(m_ignoreList).swap(m_ignoreList);
}
}
}
/* -------------------------------------------------------------------------- */
/* UTILITIES */
/* -------------------------------------------------------------------------- */