michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Disconnect connection if no conn object is available

Browse source 
When receiving a connection complete event but no connection object are
available in the host something strange has happened. In this case
the controller might have a connection that cannot be controlled by the
application. It would then be sensible to disconnect this connection in
the controller.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-01-15 14:30:27 +01:00 • committed by Johan Hedberg
commit 0861c8c834
3 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/bluetooth/host/conn.c
View file

@ -1978,22 +1978,11 @@ int bt_conn_get_remote_info(struct bt_conn *conn,
} }
} }
static int bt_hci_disconnect(struct bt_conn *conn, u8_t reason) static int conn_disconnect(struct bt_conn *conn, u8_t reason)
{ {
struct net_buf *buf;
struct bt_hci_cp_disconnect *disconn;
int err; int err;
buf = bt_hci_cmd_create(BT_HCI_OP_DISCONNECT, sizeof(*disconn)); err = bt_hci_disconnect(conn->handle, reason);
if (!buf) {
return -ENOBUFS;
}
disconn = net_buf_add(buf, sizeof(*disconn));
disconn->handle = sys_cpu_to_le16(conn->handle);
disconn->reason = reason;
err = bt_hci_cmd_send(BT_HCI_OP_DISCONNECT, buf);
if (err) { if (err) {
return err; return err;
} }
@ -2088,7 +2077,7 @@ int bt_conn_disconnect(struct bt_conn *conn, u8_t reason)
return 0; return 0;
case BT_CONN_CONNECTED: case BT_CONN_CONNECTED:
return bt_hci_disconnect(conn, reason); return conn_disconnect(conn, reason);
case BT_CONN_DISCONNECT: case BT_CONN_DISCONNECT:
return 0; return 0;
case BT_CONN_DISCONNECTED: case BT_CONN_DISCONNECTED:

18
subsys/bluetooth/host/hci_core.c
View file

@ -888,6 +888,23 @@ int bt_le_direct_conn(const struct bt_conn *conn)
} }
#endif /* CONFIG_BT_CENTRAL */ #endif /* CONFIG_BT_CENTRAL */
int bt_hci_disconnect(u16_t handle, u8_t reason)
{
struct net_buf *buf;
struct bt_hci_cp_disconnect *disconn;
buf = bt_hci_cmd_create(BT_HCI_OP_DISCONNECT, sizeof(*disconn));
if (!buf) {
return -ENOBUFS;
}
disconn = net_buf_add(buf, sizeof(*disconn));
disconn->handle = sys_cpu_to_le16(handle);
disconn->reason = reason;
return bt_hci_cmd_send(BT_HCI_OP_DISCONNECT, buf);
}
static void hci_disconn_complete(struct net_buf *buf) static void hci_disconn_complete(struct net_buf *buf)
{ {
struct bt_hci_evt_disconn_complete *evt = (void *)buf->data; struct bt_hci_evt_disconn_complete *evt = (void *)buf->data;
@ -1283,6 +1300,7 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
if (!conn) { if (!conn) {
BT_ERR("Unable to add new conn for handle %u", handle); BT_ERR("Unable to add new conn for handle %u", handle);
bt_hci_disconnect(handle, BT_HCI_ERR_MEM_CAPACITY_EXCEEDED);
return; return;
} }

2
subsys/bluetooth/host/hci_core.h
View file

@ -181,6 +181,8 @@ extern struct bt_dev bt_dev;
extern const struct bt_conn_auth_cb *bt_auth; extern const struct bt_conn_auth_cb *bt_auth;
#endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */ #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */
int bt_hci_disconnect(u16_t handle, u8_t reason);
bool bt_le_conn_params_valid(const struct bt_le_conn_param *param); bool bt_le_conn_params_valid(const struct bt_le_conn_param *param);
int bt_le_scan_update(bool fast_scan); int bt_le_scan_update(bool fast_scan);