patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: Mesh: Fixes Friend Add Another Update

Browse source 
Fixes: #20746

According MESH/NODE/FRND/FN/BV-20-C should add another
Friend Update.

Signed-off-by: Lingao Meng <mengabc1086@gmail.com>
This commit is contained in:
Lingao Meng 2019-11-26 23:33:30 -08:00 committed by Johan Hedberg
parent 6ade720851
commit 6e260af889
2 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
subsys/bluetooth/mesh/friend.c
View file

@ -190,6 +190,8 @@ void bt_mesh_friend_clear_net_idx(u16_t net_idx)
}
}
static void enqueue_update(struct bt_mesh_friend *frnd, u8_t md);
void bt_mesh_friend_sec_update(u16_t net_idx)
{
int i;
@ -204,7 +206,7 @@ void bt_mesh_friend_sec_update(u16_t net_idx)
}
if (net_idx == BT_MESH_KEY_ANY || frnd->net_idx == net_idx) {
frnd->sec_update = 1U;
enqueue_update(frnd, 0x00);
}
}
}
@ -653,7 +655,6 @@ static void enqueue_update(struct bt_mesh_friend *frnd, u8_t md)
return;
}
frnd->sec_update = 0U;
enqueue_buf(frnd, buf);
}
@ -1057,10 +1058,6 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
BT_DBG("type %u", type);
if (type == BT_MESH_FRIEND_PDU_SINGLE) {
if (frnd->sec_update) {
enqueue_update(frnd, 1);
}
enqueue_buf(frnd, buf);
return;
}
@ -1077,10 +1074,6 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
net_buf_slist_put(&seg->queue, buf);
if (type == BT_MESH_FRIEND_PDU_COMPLETE) {
if (frnd->sec_update) {
enqueue_update(frnd, 1);
}
sys_slist_merge_slist(&frnd->queue, &seg->queue);
frnd->queue_size += seg->seg_count;
@ -1127,6 +1120,38 @@ static void buf_send_end(int err, void *user_data)
}
}
static void update_overwrite(struct net_buf *buf, u8_t md)
{
struct net_buf_simple_state state;
struct bt_mesh_ctl_friend_update *upd;
if (buf->len != 16) {
return;
}
net_buf_simple_save(&buf->b, &state);
net_buf_skip(buf, 1); /* skip IVI, NID */
if (!(net_buf_pull_u8(buf) >> 7)) {
goto end;
}
net_buf_skip(buf, 7); /* skip seqnum src dec*/
if (TRANS_CTL_OP((u8_t *) net_buf_pull_mem(buf, 1))
!= TRANS_CTL_OP_FRIEND_UPDATE) {
goto end;
}
upd = net_buf_pull_mem(buf, sizeof(*upd));
BT_DBG("Update Previous Friend Update MD 0x%02x -> 0x%02x", upd->md, md);
upd->md = md;
end:
net_buf_simple_restore(&buf->b, &state);
}
static void friend_timeout(struct k_work *work)
{
struct bt_mesh_friend *frnd = CONTAINER_OF(work, struct bt_mesh_friend,
@ -1136,6 +1161,8 @@ static void friend_timeout(struct k_work *work)
.end = buf_send_end,
};
u8_t md;
__ASSERT_NO_MSG(frnd->pending_buf == 0U);
BT_DBG("lpn 0x%04x send_last %u last %p", frnd->lpn,
@ -1161,6 +1188,10 @@ static void friend_timeout(struct k_work *work)
return;
}
md = (u8_t)(sys_slist_peek_head(&frnd->queue) != NULL);
update_overwrite(frnd->last, md);
if (encrypt_friend_pdu(frnd, frnd->last, false)) {
return;
}

1
subsys/bluetooth/mesh/net.h
View file

@ -97,7 +97,6 @@ struct bt_mesh_friend {
u8_t fsn:1,
send_last:1,
pending_req:1,
sec_update:1,
pending_buf:1,
valid:1,
established:1;