espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-11 11:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/host: move att_truncate_to_mtu to ble_att_svr_tx_rsp

Browse Source 
Move att_truncate_to_mtu from ble_eatt_tx to ble_att_svr_tx_rsp.
This could cause some issues when used by client.
This commit is contained in:
Piotr Narajowski
2024-10-28 15:01:11 +01:00
committed by Szymon Janc
parent 1fa9dfd3c0
commit 027a56d46e
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_att_svr.c
+21
View File
@@ -625,6 +625,8 @@ static int
ble_att_svr_tx_rsp(uint16_t conn_handle, uint16_t cid, int hs_status, struct os_mbuf *om,
uint8_t att_op, uint8_t err_status, uint16_t err_handle)
{
struct ble_l2cap_chan *chan;
struct ble_hs_conn *conn;
int do_tx;
if (hs_status != 0 && err_status == 0) {
@@ -636,6 +638,24 @@ ble_att_svr_tx_rsp(uint16_t conn_handle, uint16_t cid, int hs_status, struct os_
if (do_tx) {
if (hs_status == 0) {
ble_hs_lock();
conn = ble_hs_conn_find(conn_handle);
if (conn == NULL) {
hs_status = BLE_HS_ENOTCONN;
ble_hs_unlock();
goto done;
}
chan = ble_hs_conn_chan_find_by_scid(conn, cid);
if (chan == NULL) {
hs_status = BLE_HS_ENOENT;
ble_hs_unlock();
goto done;
}
ble_att_truncate_to_mtu(chan, om);
ble_hs_unlock();
hs_status = ble_att_tx(conn_handle, cid, om);
om = NULL;
if (hs_status) {
@@ -643,6 +663,7 @@ ble_att_svr_tx_rsp(uint16_t conn_handle, uint16_t cid, int hs_status, struct os_
}
}
done:
if (hs_status != 0) {
STATS_INC(ble_att_stats, error_rsp_tx);
nimble/host/src/ble_eatt.c
-2
View File
@@ -476,8 +476,6 @@ ble_eatt_tx(uint16_t conn_handle, uint16_t cid, struct os_mbuf *txom)
goto error;
}
ble_att_truncate_to_mtu(eatt->chan, txom);
rc = ble_l2cap_send(eatt->chan, txom);
if (rc == 0) {
goto done;