michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Fix not allowing any PDU after pairing is finished

Browse source 
If pairing was finished it is perfectly fine for remote to send
another SMP PDU and start new pairing.

To make code simpler just use smp_reset() to set SMP into correct
state.

Change-Id: I8d04a5f0ed78c01ef4caca89f02a1ac5fe950e90
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-10-12 14:22:09 +02:00 • committed by Anas Nashif
commit a51d61d214
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
net/bluetooth/smp.c
View file

@ -401,6 +401,14 @@ static void smp_reset(struct bt_conn *conn)
{
struct bt_smp *smp = conn->smp;
if (smp->timeout) {
fiber_fiber_delayed_start_cancel(smp->timeout);
smp->timeout = NULL;
stack_analyze("smp timeout stack", smp->stack,
sizeof(smp->stack));
}
smp->method = JUST_WORKS;
atomic_set(&smp->allowed_cmds, 0);
atomic_set(&smp->flags, 0);
@ -447,18 +455,6 @@ static void smp_restart_timer(struct bt_smp *smp)
SMP_TIMEOUT);
}
static void smp_stop_timer(struct bt_smp *smp)
{
if (!smp->timeout) {
return;
}
fiber_fiber_delayed_start_cancel(smp->timeout);
smp->timeout = NULL;
stack_analyze("smp timeout stack", smp->stack, sizeof(smp->stack));
}
struct bt_buf *bt_smp_create_pdu(struct bt_conn *conn, uint8_t op, size_t len)
{
struct bt_smp_hdr *hdr;
@ -1172,8 +1168,7 @@ static uint8_t smp_master_ident(struct bt_conn *conn, struct bt_buf *buf)
/* if all keys were distributed, pairing is done */
if (!smp->local_dist && !smp->remote_dist) {
atomic_clear_bit(&smp->flags, SMP_FLAG_PAIRING);
smp_stop_timer(smp);
smp_reset(conn);
}
return 0;
@ -1264,8 +1259,7 @@ static uint8_t smp_ident_addr_info(struct bt_conn *conn, struct bt_buf *buf)
/* if all keys were distributed, pairing is done */
if (!smp->local_dist && !smp->remote_dist) {
atomic_clear_bit(&smp->flags, SMP_FLAG_PAIRING);
smp_stop_timer(smp);
smp_reset(conn);
}
return 0;
@ -1299,8 +1293,7 @@ static uint8_t smp_signing_info(struct bt_conn *conn, struct bt_buf *buf)
/* if all keys were distributed, pairing is done */
if (!smp->local_dist && !smp->remote_dist) {
atomic_clear_bit(&smp->flags, SMP_FLAG_PAIRING);
smp_stop_timer(smp);
smp_reset(conn);
}
return 0;
@ -1470,7 +1463,10 @@ static void bt_smp_disconnected(struct bt_conn *conn)
conn->smp = NULL;
smp_stop_timer(smp);
if (smp->timeout) {
fiber_fiber_delayed_start_cancel(smp->timeout);
}
memset(smp, 0, sizeof(*smp));
}
@ -1518,8 +1514,7 @@ static void bt_smp_encrypt_change(struct bt_conn *conn)
/* if all keys were distributed, pairing is done */
if (!smp->local_dist && !smp->remote_dist) {
atomic_clear_bit(&smp->flags, SMP_FLAG_PAIRING);
smp_stop_timer(smp);
smp_reset(conn);
}
}