michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Reserve conn object for connectable advertiser

Browse source 
Reserve conn object for undirected connectable advertiser. This means we
won't have a situation where we start a connectable advertise but will
fail to allocate a connection object for it in the connection complete
event.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-01-07 14:16:49 +01:00 • committed by Johan Hedberg
commit 46bf20036a
4 changed files with 95 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,8 @@ static inline const char *state2str(bt_conn_state_t state)
return "connect-scan";
case BT_CONN_CONNECT_DIR_ADV:
return "connect-dir-adv";
case BT_CONN_CONNECT_ADV:
return "connect-adv";
case BT_CONN_CONNECT_AUTO:
return "connect-auto";
case BT_CONN_CONNECT:
@ -337,6 +339,16 @@ static void conn_update_timeout(struct k_work *work)
* state transition.
*/
bt_conn_unref(conn);
/* A new reference likely to have been released here,
* Resume advertising.
*/
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) &&
!atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING)) {
bt_le_adv_resume();
}
return;
}
@ -1707,10 +1719,17 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
* by the application, so don't notify.
*/
bt_conn_unref(conn);
} else if (old_state == BT_CONN_CONNECT_ADV) {
/* This can only happen when application stops the
* advertiser, conn->err is never set in this case.
*/
bt_conn_unref(conn);
}
break;
case BT_CONN_CONNECT_AUTO:
break;
case BT_CONN_CONNECT_ADV:
break;
case BT_CONN_CONNECT_SCAN:
break;
case BT_CONN_CONNECT_DIR_ADV:

1
subsys/bluetooth/host/conn_internal.h
View file

@ -11,6 +11,7 @@ typedef enum __packed {
BT_CONN_DISCONNECTED,
BT_CONN_CONNECT_SCAN,
BT_CONN_CONNECT_AUTO,
BT_CONN_CONNECT_ADV,
BT_CONN_CONNECT_DIR_ADV,
BT_CONN_CONNECT,
BT_CONN_CONNECTED,

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

@ -946,13 +946,10 @@ static void hci_disconn_complete(struct net_buf *buf)
bt_conn_unref(conn);
advertise:
if (atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) &&
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) &&
!atomic_test_bit(bt_dev.flags, BT_DEV_ADVERTISING)) {
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
le_set_private_addr(bt_dev.adv_id);
}
set_advertise_enable(true);
bt_le_adv_resume();
}
}
@ -1117,6 +1114,11 @@ static struct bt_conn *find_pending_connect(u8_t role, bt_addr_le_t *peer_addr)
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) && role == BT_HCI_ROLE_SLAVE) {
conn = bt_conn_lookup_state_le(peer_addr,
BT_CONN_CONNECT_DIR_ADV);
if (!conn) {
conn = bt_conn_lookup_state_le(BT_ADDR_LE_NONE,
BT_CONN_CONNECT_ADV);
}
return conn;
}
@ -1263,16 +1265,10 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
evt->role == BT_HCI_ROLE_SLAVE) {
/*
* clear advertising even if we are not able to add connection
/* Clear advertising even if we are not able to add connection
* object to keep host in sync with controller state
*/
atomic_clear_bit(bt_dev.flags, BT_DEV_ADVERTISING);
/* for slave we may need to add new connection */
if (!conn) {
conn = bt_conn_add_le(bt_dev.adv_id, &id_addr);
}
}
if (IS_ENABLED(CONFIG_BT_CENTRAL) &&
@ -1321,11 +1317,7 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
*/
if (atomic_test_bit(bt_dev.flags, BT_DEV_KEEP_ADVERTISING) &&
BT_LE_STATES_SLAVE_CONN_ADV(bt_dev.le.states)) {
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
le_set_private_addr(bt_dev.adv_id);
}
set_advertise_enable(true);
bt_le_adv_resume();
}
}
@ -5808,6 +5800,7 @@ int bt_le_adv_start_internal(const struct bt_le_adv_param *param,
{
struct bt_hci_cp_le_set_adv_param set_param;
const bt_addr_le_t *id_addr;
struct bt_conn *conn = NULL;
struct net_buf *buf;
bool dir_adv = (peer != NULL);
int err = 0;
@ -5948,13 +5941,37 @@ int bt_le_adv_start_internal(const struct bt_le_adv_param *param,
if (err) {
return err;
}
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
param->options & BT_LE_ADV_OPT_CONNECTABLE) {
conn = bt_conn_add_le(param->id, BT_ADDR_LE_NONE);
if (!conn) {
return -ENOMEM;
}
bt_conn_set_state(conn, BT_CONN_CONNECT_ADV);
}
}
err = set_advertise_enable(true);
if (err) {
BT_ERR("Failed to start advertiser");
if (conn) {
bt_conn_set_state(conn, BT_CONN_DISCONNECTED);
bt_conn_unref(conn);
}
return err;
}
if (conn) {
/* If undirected connectable advertiser we have created a
* connection object that we don't yet give to the application.
* Since we don't give the application a reference to manage in
* this case, we need to release this reference here
*/
bt_conn_unref(conn);
}
atomic_set_bit_to(bt_dev.flags, BT_DEV_KEEP_ADVERTISING,
!(param->options & BT_LE_ADV_OPT_ONE_TIME));
@ -5994,6 +6011,13 @@ int bt_le_adv_stop(void)
if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
struct bt_conn *conn;
conn = bt_conn_lookup_state_le(BT_ADDR_LE_NONE,
BT_CONN_CONNECT_ADV);
if (conn) {
bt_conn_set_state(conn, BT_CONN_DISCONNECTED);
bt_conn_unref(conn);
}
conn = bt_conn_lookup_state_le(NULL, BT_CONN_CONNECT_DIR_ADV);
if (conn) {
bt_conn_set_state(conn, BT_CONN_DISCONNECTED);
@ -6017,6 +6041,38 @@ int bt_le_adv_stop(void)
return 0;
}
#if defined(CONFIG_BT_PERIPHERAL)
void bt_le_adv_resume(void)
{
struct bt_conn *adv_conn;
int err;
BT_ASSERT(atomic_test_bit(bt_dev.flags,
BT_DEV_ADVERTISING_CONNECTABLE));
adv_conn = bt_conn_add_le(bt_dev.adv_id, BT_ADDR_LE_NONE);
if (!adv_conn) {
return;
}
bt_conn_set_state(adv_conn, BT_CONN_CONNECT_ADV);
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
le_set_private_addr(bt_dev.adv_id);
}
err = set_advertise_enable(true);
if (err) {
bt_conn_set_state(adv_conn, BT_CONN_DISCONNECTED);
}
/* Since we don't give the application a reference to manage in
* this case, we need to release this reference here.
*/
bt_conn_unref(adv_conn);
}
#endif /* defined(CONFIG_BT_PERIPHERAL) */
#if defined(CONFIG_BT_OBSERVER)
static bool valid_le_scan_param(const struct bt_le_scan_param *param)
{

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

@ -208,3 +208,4 @@ int bt_le_adv_start_internal(const struct bt_le_adv_param *param,
const struct bt_data *ad, size_t ad_len,
const struct bt_data *sd, size_t sd_len,
const bt_addr_le_t *peer);
void bt_le_adv_resume(void);