michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Use #ifdef for provisioner build

Browse source 
Replaces the current zero length array for provisioner data with
ifdefs, to silence new gcc 10 warnings about array element access.

Fixes #28371.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2020-09-15 10:26:28 +02:00 • committed by Johan Hedberg
commit d7e0d8135f
1 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

113
subsys/bluetooth/mesh/prov.c
View file

@ -83,12 +83,6 @@ enum {
NUM_FLAGS,
};
#if defined(CONFIG_BT_MESH_PROVISIONER)
#define PROVISIONER_LINK 1
#else
#define PROVISIONER_LINK 0
#endif
struct provisioner_link {
struct bt_mesh_cdb_node *node;
uint16_t addr;
@ -99,7 +93,9 @@ struct provisioner_link {
struct prov_link {
ATOMIC_DEFINE(flags, NUM_FLAGS);
struct provisioner_link provisioner[PROVISIONER_LINK];
#if defined(CONFIG_BT_MESH_PROVISIONER)
struct provisioner_link provisioner;
#endif
uint8_t dhkey[32]; /* Calculated DHKey */
uint8_t expect; /* Next expected PDU */
@ -129,7 +125,6 @@ static const struct bt_mesh_prov *prov;
static void send_pub_key(void);
static void pub_key_ready(const uint8_t *pkey);
static void start_sent(int err, void *cb_data);
static int reset_state(void)
{
@ -143,10 +138,11 @@ static int reset_state(void)
bt_mesh_attention(NULL, 0);
}
if (IS_ENABLED(CONFIG_BT_MESH_PROVISIONER) &&
link.provisioner->node != NULL) {
bt_mesh_cdb_node_del(link.provisioner->node, false);
#if defined(CONFIG_BT_MESH_PROVISIONER)
if (link.provisioner.node != NULL) {
bt_mesh_cdb_node_del(link.provisioner.node, false);
}
#endif
memset(&link, 0, sizeof(link));
@ -257,6 +253,9 @@ static void prov_invite(const uint8_t *data)
link.expect = PROV_START;
}
#if defined(CONFIG_BT_MESH_PROVISIONER)
static void start_sent(int err, void *cb_data);
static void send_invite(void)
{
PROV_BUF(inv, 2);
@ -264,9 +263,9 @@ static void send_invite(void)
BT_DBG("");
prov_buf_init(&inv, PROV_INVITE);
net_buf_simple_add_u8(&inv, link.provisioner->attention_duration);
net_buf_simple_add_u8(&inv, link.provisioner.attention_duration);
link.conf_inputs[0] = link.provisioner->attention_duration;
link.conf_inputs[0] = link.provisioner.attention_duration;
if (prov_send(&inv, NULL)) {
BT_ERR("Failed to send invite");
@ -301,24 +300,20 @@ static void send_start(void)
static void start_sent(int err, void *cb_data)
{
if (IS_ENABLED(CONFIG_BT_MESH_PROVISIONER)) {
if (!bt_pub_key_get()) {
atomic_set_bit(link.flags, WAIT_PUB_KEY);
BT_WARN("Waiting for local public key");
} else {
send_pub_key();
}
if (!bt_pub_key_get()) {
atomic_set_bit(link.flags, WAIT_PUB_KEY);
BT_WARN("Waiting for local public key");
} else {
send_pub_key();
}
}
#endif
static void prov_capabilities(const uint8_t *data)
{
#if defined(CONFIG_BT_MESH_PROVISIONER)
uint16_t algorithms, output_action, input_action;
if (!IS_ENABLED(CONFIG_BT_MESH_PROVISIONER)) {
return;
}
BT_DBG("Elements: %u", data[0]);
algorithms = sys_get_be16(&data[1]);
@ -342,12 +337,12 @@ static void prov_capabilities(const uint8_t *data)
return;
}
link.provisioner->node =
bt_mesh_cdb_node_alloc(link.provisioner->uuid,
link.provisioner->addr, data[0],
link.provisioner->net_idx);
if (link.provisioner->node == NULL) {
BT_ERR("Failed allocating node 0x%04x", link.provisioner->addr);
link.provisioner.node =
bt_mesh_cdb_node_alloc(link.provisioner.uuid,
link.provisioner.addr, data[0],
link.provisioner.net_idx);
if (link.provisioner.node == NULL) {
BT_ERR("Failed allocating node 0x%04x", link.provisioner.addr);
prov_fail(PROV_ERR_RESOURCES);
return;
}
@ -355,6 +350,7 @@ static void prov_capabilities(const uint8_t *data)
memcpy(&link.conf_inputs[1], data, 11);
send_start();
#endif
}
static bt_mesh_output_action_t output_action(uint8_t action)
@ -765,6 +761,7 @@ static void prov_input_complete(const uint8_t *data)
notify_input_complete();
}
#if defined(CONFIG_BT_MESH_PROVISIONER)
static void send_prov_data(void)
{
PROV_BUF(pdu, 34);
@ -792,34 +789,34 @@ static void send_prov_data(void)
BT_DBG("Nonce: %s", bt_hex(nonce, 13));
err = bt_mesh_dev_key(link.dhkey, link.prov_salt,
link.provisioner->node->dev_key);
link.provisioner.node->dev_key);
if (err) {
BT_ERR("Unable to generate device key");
prov_fail(PROV_ERR_UNEXP_ERR);
return;
}
BT_DBG("DevKey: %s", bt_hex(link.provisioner->node->dev_key, 16));
BT_DBG("DevKey: %s", bt_hex(link.provisioner.node->dev_key, 16));
sub = bt_mesh_cdb_subnet_get(link.provisioner->node->net_idx);
sub = bt_mesh_cdb_subnet_get(link.provisioner.node->net_idx);
if (sub == NULL) {
BT_ERR("No subnet with net_idx %u",
link.provisioner->node->net_idx);
link.provisioner.node->net_idx);
prov_fail(PROV_ERR_UNEXP_ERR);
return;
}
prov_buf_init(&pdu, PROV_DATA);
net_buf_simple_add_mem(&pdu, sub->keys[sub->kr_flag].net_key, 16);
net_buf_simple_add_be16(&pdu, link.provisioner->node->net_idx);
net_buf_simple_add_be16(&pdu, link.provisioner.node->net_idx);
net_buf_simple_add_u8(&pdu, bt_mesh_cdb_subnet_flags(sub));
net_buf_simple_add_be32(&pdu, bt_mesh_cdb.iv_index);
net_buf_simple_add_be16(&pdu, link.provisioner->node->addr);
net_buf_simple_add_be16(&pdu, link.provisioner.node->addr);
net_buf_simple_add(&pdu, 8); /* For MIC */
BT_DBG("net_idx %u, iv_index 0x%08x, addr 0x%04x",
link.provisioner->node->net_idx, bt_mesh.iv_index,
link.provisioner->node->addr);
link.provisioner.node->net_idx, bt_mesh.iv_index,
link.provisioner.node->addr);
err = bt_mesh_prov_encrypt(session_key, nonce, &pdu.data[1],
&pdu.data[1]);
@ -836,14 +833,12 @@ static void send_prov_data(void)
link.expect = PROV_COMPLETE;
}
#endif
static void prov_complete(const uint8_t *data)
{
if (!IS_ENABLED(CONFIG_BT_MESH_PROVISIONER)) {
return;
}
struct bt_mesh_cdb_node *node = link.provisioner->node;
#if defined(CONFIG_BT_MESH_PROVISIONER)
struct bt_mesh_cdb_node *node = link.provisioner.node;
BT_DBG("key %s, net_idx %u, num_elem %u, addr 0x%04x",
bt_hex(node->dev_key, 16), node->net_idx, node->num_elem,
@ -853,13 +848,14 @@ static void prov_complete(const uint8_t *data)
bt_mesh_store_cdb_node(node);
}
link.provisioner->node = NULL;
link.provisioner.node = NULL;
prov_link_close(PROV_BEARER_LINK_STATUS_SUCCESS);
if (prov->node_added) {
prov->node_added(node->net_idx, node->uuid, node->addr,
node->num_elem);
}
#endif
}
static void send_random(void)
@ -919,12 +915,14 @@ static void prov_random(const uint8_t *data)
BT_DBG("ProvisioningSalt: %s", bt_hex(link.prov_salt, 16));
if (IS_ENABLED(CONFIG_BT_MESH_PROVISIONER) &&
atomic_test_bit(link.flags, PROVISIONER)) {
#if defined(CONFIG_BT_MESH_PROVISIONER)
if (atomic_test_bit(link.flags, PROVISIONER)) {
send_prov_data();
} else {
send_random();
return;
}
#endif
send_random();
}
static void prov_confirm(const uint8_t *data)
@ -1095,11 +1093,14 @@ static void prov_link_opened(const struct prov_bearer *bearer, void *cb_data)
link.bearer = bearer;
#if defined(CONFIG_BT_MESH_PROVISIONER)
if (atomic_test_bit(link.flags, PROVISIONER)) {
send_invite();
} else {
link.expect = PROV_INVITE;
return;
}
#endif
link.expect = PROV_INVITE;
}
static void prov_link_closed(const struct prov_bearer *bearer, void *cb_data,
@ -1130,7 +1131,7 @@ static const struct prov_bearer_cb prov_bearer_cb = {
.recv = prov_recv,
};
#if defined(CONFIG_BT_MESH_PB_ADV)
#if defined(CONFIG_BT_MESH_PB_ADV) && defined(CONFIG_BT_MESH_PROVISIONER)
int bt_mesh_pb_adv_open(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
uint8_t attention_duration)
{
@ -1146,13 +1147,13 @@ int bt_mesh_pb_adv_open(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
BT_DBG("Provisioning %s", bt_uuid_str(&uuid_repr.uuid));
atomic_set_bit(link.flags, PROVISIONER);
memcpy(link.provisioner->uuid, uuid, 16);
link.provisioner->addr = addr;
link.provisioner->net_idx = net_idx;
link.provisioner->attention_duration = attention_duration;
memcpy(link.provisioner.uuid, uuid, 16);
link.provisioner.addr = addr;
link.provisioner.net_idx = net_idx;
link.provisioner.attention_duration = attention_duration;
link.bearer = &pb_adv;
err = link.bearer->link_open(link.provisioner->uuid, PROTOCOL_TIMEOUT,
err = link.bearer->link_open(link.provisioner.uuid, PROTOCOL_TIMEOUT,
&prov_bearer_cb, NULL);
if (err) {
atomic_clear_bit(link.flags, LINK_ACTIVE);