mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

att_server: set request_att_server to same connection as request_con_handle

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-18 16:39:02 +02:00
parent ed053a3580
commit 69d32c5615
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ble/att_server.c
View File

@ -648,6 +648,7 @@ static void att_server_handle_can_send_now(void){
hci_con_handle_t request_con_handle = HCI_CON_HANDLE_INVALID; hci_con_handle_t request_con_handle = HCI_CON_HANDLE_INVALID;
hci_con_handle_t last_send_con_handle = HCI_CON_HANDLE_INVALID; hci_con_handle_t last_send_con_handle = HCI_CON_HANDLE_INVALID;
att_server_t * request_att_server = NULL;
int can_send_now = 1; int can_send_now = 1;
int phase_index; int phase_index;
@ -669,6 +670,7 @@ static void att_server_handle_can_send_now(void){
if (skip_connections_until != HCI_CON_HANDLE_INVALID){ if (skip_connections_until != HCI_CON_HANDLE_INVALID){
if (data_ready && request_con_handle == HCI_CON_HANDLE_INVALID){ if (data_ready && request_con_handle == HCI_CON_HANDLE_INVALID){
request_con_handle = att_server->connection.con_handle; request_con_handle = att_server->connection.con_handle;
request_att_server = att_server;
} }
if (skip_connections_until == att_server->connection.con_handle){ if (skip_connections_until == att_server->connection.con_handle){
skip_connections_until = HCI_CON_HANDLE_INVALID; skip_connections_until = HCI_CON_HANDLE_INVALID;
@ -684,9 +686,11 @@ static void att_server_handle_can_send_now(void){
data_ready = att_server_data_ready_for_phase(att_server, phase); data_ready = att_server_data_ready_for_phase(att_server, phase);
if (data_ready && request_con_handle == HCI_CON_HANDLE_INVALID){ if (data_ready && request_con_handle == HCI_CON_HANDLE_INVALID){
request_con_handle = att_server->connection.con_handle; request_con_handle = att_server->connection.con_handle;
request_att_server = att_server;
} }
} else { } else {
request_con_handle = att_server->connection.con_handle; request_con_handle = att_server->connection.con_handle;
request_att_server = att_server;
break; break;
} }
} }
@ -703,6 +707,7 @@ static void att_server_handle_can_send_now(void){
// Finally, if we still can send and there are requests, just try again // Finally, if we still can send and there are requests, just try again
request_con_handle = HCI_CON_HANDLE_INVALID; request_con_handle = HCI_CON_HANDLE_INVALID;
request_att_server = NULL;
} }
// update last send con handle for round robin // update last send con handle for round robin
if (last_send_con_handle != HCI_CON_HANDLE_INVALID){ if (last_send_con_handle != HCI_CON_HANDLE_INVALID){
@ -711,7 +716,7 @@ static void att_server_handle_can_send_now(void){
} }
if (request_con_handle == HCI_CON_HANDLE_INVALID) return; if (request_con_handle == HCI_CON_HANDLE_INVALID) return;
att_dispatch_server_request_can_send_now_event(request_con_handle); att_server_request_can_send_now(request_att_server);
} }
static void att_server_handle_att_pdu(att_server_t * att_server, uint8_t * packet, uint16_t size){ static void att_server_handle_att_pdu(att_server_t * att_server, uint8_t * packet, uint16_t size){