Bluetooth: Mesh: Inclusive terminology
Implements the Bluetooth appropriate language mapping for the Bluetooth
mesh subsystem.
Changes the following terms:
- Master security credentials -> Flooding security credentials
- Whitelist filter -> Accept filter
- Blacklist filter -> Reject filter
- Removes CDB's NODE_BLACKLISTED, which was not in use.
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
diff --git a/include/bluetooth/mesh/cdb.h b/include/bluetooth/mesh/cdb.h
index 9bae861..219b23a 100644
--- a/include/bluetooth/mesh/cdb.h
+++ b/include/bluetooth/mesh/cdb.h
@@ -25,7 +25,6 @@
enum {
BT_MESH_CDB_NODE_CONFIGURED,
- BT_MESH_CDB_NODE_BLACKLISTED,
BT_MESH_CDB_NODE_FLAG_COUNT
};
diff --git a/subsys/bluetooth/mesh/friend.c b/subsys/bluetooth/mesh/friend.c
index 4d533c1..20459d6 100644
--- a/subsys/bluetooth/mesh/friend.c
+++ b/subsys/bluetooth/mesh/friend.c
@@ -461,14 +461,14 @@
}
static int encrypt_friend_pdu(struct bt_mesh_friend *frnd, struct net_buf *buf,
- bool master_cred)
+ bool flooding_cred)
{
const struct bt_mesh_net_cred *cred;
uint32_t iv_index;
uint16_t src;
int err;
- if (master_cred) {
+ if (flooding_cred) {
cred = &frnd->subnet->keys[SUBNET_KEY_TX_IDX(frnd->subnet)]
.msg;
} else {
diff --git a/subsys/bluetooth/mesh/gatt_services.c b/subsys/bluetooth/mesh/gatt_services.c
index 0a03ba8..02eb28e 100644
--- a/subsys/bluetooth/mesh/gatt_services.c
+++ b/subsys/bluetooth/mesh/gatt_services.c
@@ -88,8 +88,8 @@
uint16_t filter[CONFIG_BT_MESH_PROXY_FILTER_SIZE];
enum __packed {
NONE,
- WHITELIST,
- BLACKLIST,
+ ACCEPT,
+ REJECT,
PROV,
} filter_type;
#if defined(CONFIG_BT_MESH_GATT_PROXY)
@@ -180,11 +180,11 @@
switch (type) {
case 0x00:
(void)memset(client->filter, 0, sizeof(client->filter));
- client->filter_type = WHITELIST;
+ client->filter_type = ACCEPT;
break;
case 0x01:
(void)memset(client->filter, 0, sizeof(client->filter));
- client->filter_type = BLACKLIST;
+ client->filter_type = REJECT;
break;
default:
BT_WARN("Prohibited Filter Type 0x%02x", type);
@@ -256,7 +256,7 @@
net_buf_simple_add_u8(buf, CFG_FILTER_STATUS);
- if (client->filter_type == WHITELIST) {
+ if (client->filter_type == ACCEPT) {
net_buf_simple_add_u8(buf, 0x00);
} else {
net_buf_simple_add_u8(buf, 0x01);
@@ -666,7 +666,7 @@
__ASSERT(client, "No client for connection");
if (client->filter_type == NONE) {
- client->filter_type = WHITELIST;
+ client->filter_type = ACCEPT;
k_work_submit(&client->send_beacons);
}
@@ -714,7 +714,7 @@
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].cli.conn) {
- clients[i].filter_type = WHITELIST;
+ clients[i].filter_type = ACCEPT;
}
}
@@ -730,8 +730,8 @@
for (i = 0; i < ARRAY_SIZE(clients); i++) {
struct bt_mesh_proxy_client *client = &clients[i];
- if (client->cli.conn && (client->filter_type == WHITELIST ||
- client->filter_type == BLACKLIST)) {
+ if (client->cli.conn && (client->filter_type == ACCEPT ||
+ client->filter_type == REJECT)) {
client->filter_type = NONE;
bt_conn_disconnect(client->cli.conn,
BT_HCI_ERR_REMOTE_USER_TERM_CONN);
@@ -766,9 +766,9 @@
BT_DBG("filter_type %u addr 0x%04x", client->filter_type, addr);
- if (client->filter_type == WHITELIST) {
+ if (client->filter_type == ACCEPT) {
filter_add(client, addr);
- } else if (client->filter_type == BLACKLIST) {
+ } else if (client->filter_type == REJECT) {
filter_remove(client, addr);
}
}
@@ -780,7 +780,7 @@
BT_DBG("filter_type %u addr 0x%04x", client->filter_type, addr);
- if (client->filter_type == BLACKLIST) {
+ if (client->filter_type == REJECT) {
for (i = 0; i < ARRAY_SIZE(client->filter); i++) {
if (client->filter[i] == addr) {
return false;
@@ -794,7 +794,7 @@
return true;
}
- if (client->filter_type == WHITELIST) {
+ if (client->filter_type == ACCEPT) {
for (i = 0; i < ARRAY_SIZE(client->filter); i++) {
if (client->filter[i] == addr) {
return true;
diff --git a/subsys/bluetooth/mesh/lpn.c b/subsys/bluetooth/mesh/lpn.c
index ab41d26..684099e 100644
--- a/subsys/bluetooth/mesh/lpn.c
+++ b/subsys/bluetooth/mesh/lpn.c
@@ -992,7 +992,7 @@
if (!lpn->established) {
/* This is normally checked on the transport layer, however
- * in this state we're also still accepting master
+ * in this state we're also still accepting flooding
* credentials so we need to ensure the right ones (Friend
* Credentials) were used for this message.
*/
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index 31603c4..79aa9d7 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -698,7 +698,7 @@
}
/* When the Friend node relays message for lpn, the message will be
- * retransmitted using the managed master security credentials and
+ * retransmitted using the managed flooding security credentials and
* the Network PDU shall be retransmitted to all network interfaces.
*/
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) &&
