Skip to content

apps/bttester: send disconnected event in case of l2cap conn req failure #2184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piotrnarajowski wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −42
Open

apps/bttester: send disconnected event in case of l2cap conn req failure #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d3efa9
nimble/l2cap: remove unnecessary error base conversion
piotrnarajowski Mar 13, 2026
27a5379
apps/bttester: send disconnected event in case of l2cap conn req failure
piotrnarajowski Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions apps/bttester/src/btp_l2cap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,23 @@ connected_cb(uint16_t conn_handle, struct ble_l2cap_chan *chan,

static void
disconnected_cb(uint16_t conn_handle, struct ble_l2cap_chan *chan,
struct ble_l2cap_chan_info *chan_info, void *arg)
struct ble_l2cap_chan_info *chan_info, int status, void *arg)
{
struct btp_l2cap_disconnected_ev ev;
struct ble_gap_conn_desc desc;
struct channel *channel;

memset(&ev, 0, sizeof(struct btp_l2cap_disconnected_ev));

channel = find_channel(chan);
assert(channel != NULL);
if (status != 0 && status != BLE_L2CAP_EVENT_COC_DISCONNECTED) {
/* Conection request failed */
channel = get_free_channel();
} else {
channel = find_channel(chan);
assert(channel != NULL);
}

ev.result = status;
ev.chan_id = channel->chan_id;
ev.psm = chan_info->psm;

Expand Down Expand Up @@ -266,6 +272,8 @@ tester_l2cap_event(struct ble_l2cap_event *event, void *arg)

if (event->connect.status) {
console_printf("LE COC error: %d\n", event->connect.status);
disconnected_cb(event->connect.conn_handle, event->connect.chan,
&chan_info, (uint8_t)event->connect.status, arg);
return 0;
}

Expand All @@ -290,8 +298,8 @@ tester_l2cap_event(struct ble_l2cap_event *event, void *arg)
console_printf("LE CoC disconnected, chan: 0x%08lx\n",
(uint32_t) event->disconnect.chan);

disconnected_cb(event->disconnect.conn_handle,
event->disconnect.chan, &chan_info, arg);
disconnected_cb(event->disconnect.conn_handle, event->disconnect.chan,
&chan_info, (uint8_t)event->connect.status, arg);
return 0;
case BLE_L2CAP_EVENT_COC_ACCEPT:
ble_l2cap_get_chan_info(event->accept.chan,
Expand Down
33 changes: 2 additions & 31 deletions nimble/host/src/ble_l2cap_sig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,35 +646,6 @@ ble_l2cap_sig_update(uint16_t conn_handle, struct ble_l2cap_sig_update_params *p

#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0

static int
ble_l2cap_sig_coc_err2ble_hs_err(uint16_t l2cap_coc_err)
{
switch (l2cap_coc_err) {
case BLE_L2CAP_COC_ERR_CONNECTION_SUCCESS:
return 0;
case BLE_L2CAP_COC_ERR_UNKNOWN_LE_PSM:
return BLE_HS_ENOTSUP;
case BLE_L2CAP_COC_ERR_NO_RESOURCES:
return BLE_HS_ENOMEM;
case BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHEN:
return BLE_HS_EAUTHEN;
case BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHOR:
return BLE_HS_EAUTHOR;
case BLE_L2CAP_COC_ERR_INSUFFICIENT_KEY_SZ:
return BLE_HS_EENCRYPT_KEY_SZ;
case BLE_L2CAP_COC_ERR_INSUFFICIENT_ENC:
return BLE_HS_EENCRYPT;
case BLE_L2CAP_COC_ERR_INVALID_SOURCE_CID:
return BLE_HS_EREJECT;
case BLE_L2CAP_COC_ERR_SOURCE_CID_ALREADY_USED:
return BLE_HS_EALREADY;
case BLE_L2CAP_COC_ERR_UNACCEPTABLE_PARAMETERS:
return BLE_HS_EINVAL;
default:
return BLE_HS_EUNKNOWN;
}
}

static int
ble_l2cap_sig_ble_hs_err2coc_err(uint16_t ble_hs_err)
{
Expand Down Expand Up @@ -1153,7 +1124,7 @@ ble_l2cap_sig_credit_base_con_rsp_rx(uint16_t conn_handle,
rsp = (struct ble_l2cap_sig_credit_base_connect_rsp *)(*om)->om_data;

if (rsp->result) {
rc = ble_l2cap_sig_coc_err2ble_hs_err(le16toh(rsp->result));
rc = BLE_HS_L2C_ERR(le16toh(rsp->result));
/* Below results means that some of the channels has not been created
* and we have to look closer into the response.
* Any other results means that all the connections has been refused.
Expand Down Expand Up @@ -1346,7 +1317,7 @@ ble_l2cap_sig_coc_rsp_rx(uint16_t conn_handle, struct ble_l2cap_sig_hdr *hdr,
chan = proc->connect.chan[0];

if (rsp->result) {
rc = ble_l2cap_sig_coc_err2ble_hs_err(le16toh(rsp->result));
rc = BLE_HS_L2C_ERR(le16toh(rsp->result));
goto done;
}

Expand Down
12 changes: 6 additions & 6 deletions nimble/host/test/src/ble_l2cap_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ ble_l2cap_test_event(struct ble_l2cap_event *event, void *arg)
ev->handled = 1;
switch(event->type) {
case BLE_L2CAP_EVENT_COC_CONNECTED:
assert(ev->app_status == event->connect.status);
assert(ev->app_status == (uint8_t)event->connect.status);
t->chan[0] = event->connect.chan;
return 0;
case BLE_L2CAP_EVENT_COC_DISCONNECTED:
Expand Down Expand Up @@ -1154,7 +1154,7 @@ TEST_CASE_SELF(ble_l2cap_test_case_sig_coc_conn_invalid_psm)
t.expected_num_iters = 1;

t.event[0].type = BLE_L2CAP_EVENT_COC_CONNECTED;
t.event[0].app_status = BLE_HS_ENOTSUP;
t.event[0].app_status = BLE_L2CAP_COC_ERR_UNKNOWN_LE_PSM;
t.event[0].l2cap_status = BLE_L2CAP_COC_ERR_UNKNOWN_LE_PSM;

ble_l2cap_test_coc_connect(&t);
Expand All @@ -1177,7 +1177,7 @@ TEST_CASE_SELF(ble_l2cap_test_case_sig_coc_conn_out_of_resource)
t.expected_num_iters = 1;

t.event[0].type = BLE_L2CAP_EVENT_COC_CONNECTED;
t.event[0].app_status = BLE_HS_ENOMEM;
t.event[0].app_status = BLE_L2CAP_COC_ERR_NO_RESOURCES;
t.event[0].l2cap_status = BLE_L2CAP_COC_ERR_NO_RESOURCES;

ble_l2cap_test_coc_connect(&t);
Expand All @@ -1199,7 +1199,7 @@ TEST_CASE_SELF(ble_l2cap_test_case_sig_coc_conn_invalid_cid)
t.expected_num_of_ev = 1;

t.event[0].type = BLE_L2CAP_EVENT_COC_CONNECTED;
t.event[0].app_status = BLE_HS_EREJECT;
t.event[0].app_status = BLE_L2CAP_COC_ERR_INVALID_SOURCE_CID;
t.event[0].l2cap_status = BLE_L2CAP_COC_ERR_INVALID_SOURCE_CID;

ble_l2cap_test_coc_connect(&t);
Expand All @@ -1220,7 +1220,7 @@ TEST_CASE_SELF(ble_l2cap_test_case_sig_coc_conn_insuff_authen)
t.expected_num_of_ev = 1;

t.event[0].type = BLE_L2CAP_EVENT_COC_CONNECTED;
t.event[0].app_status = BLE_HS_EAUTHEN;
t.event[0].app_status = BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHEN;
t.event[0].l2cap_status = BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHEN;

ble_l2cap_test_coc_connect(&t);
Expand All @@ -1241,7 +1241,7 @@ TEST_CASE_SELF(ble_l2cap_test_case_sig_coc_conn_insuff_author)
t.expected_num_of_ev = 1;

t.event[0].type = BLE_L2CAP_EVENT_COC_CONNECTED;
t.event[0].app_status = BLE_HS_EAUTHOR;
t.event[0].app_status = BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHOR;
t.event[0].l2cap_status = BLE_L2CAP_COC_ERR_INSUFFICIENT_AUTHOR;

ble_l2cap_test_coc_connect(&t);
Expand Down
Loading