espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-29 13:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

l2cap: Fix channel creation

Browse Source 
Previously the channel was added to the channels list after sending
COC Accept event to the application. The application called
ble_l2cap_coc_recv_ready which was trying to find channel on a list,
but failed. With this patch the channel is added on a list before sending
Accept event, and if the application returns an error, the channel is removed
from the list. Moreover if we fail to send Connection Success, the application
should now not receive a confirmation that we are connected.
This commit is contained in:
Michał Narajowski
2019-01-24 01:07:06 +01:00
parent 0f7ca647de
commit e03c13e0e9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_l2cap_sig.c
+7 -6
View File
@@ -691,6 +691,7 @@ ble_l2cap_sig_coc_req_rx(uint16_t conn_handle, struct ble_l2cap_sig_hdr *hdr,
chan->coc_tx.credits = le16toh(req->credits);
chan->coc_tx.mtu = le16toh(req->mtu);
ble_hs_conn_chan_insert(conn, chan);
ble_hs_unlock();
rc = ble_l2cap_event_coc_accept(chan, le16toh(req->mtu));
@@ -700,7 +701,9 @@ ble_l2cap_sig_coc_req_rx(uint16_t conn_handle, struct ble_l2cap_sig_hdr *hdr,
/* Make sure we do not send disconnect event when removing channel */
chan->cb = NULL;
ble_l2cap_chan_free(chan);
ble_hs_lock();
ble_hs_conn_delete_chan(conn, chan);
ble_hs_unlock();
rsp->result = htole16(coc_err);
goto failed;
}
@@ -712,13 +715,11 @@ ble_l2cap_sig_coc_req_rx(uint16_t conn_handle, struct ble_l2cap_sig_hdr *hdr,
rsp->result = htole16(BLE_L2CAP_COC_ERR_CONNECTION_SUCCESS);
rc = ble_l2cap_sig_tx(conn_handle, txom);
if (rc == 0) {
/* Response sent out with a success. We are connected now*/
if (rc != 0) {
ble_hs_lock();
ble_hs_conn_chan_insert(conn, chan);
ble_hs_conn_delete_chan(conn, chan);
ble_hs_unlock();
} else {
ble_l2cap_chan_free(chan);
return 0;
}
/* Notify user about connection status */