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

goep_server: assert if request can send now is called after outgoing buffer was reserved

Browse Source
This commit is contained in:
Matthias Ringwald 2022-12-21 11:54:31 +01:00
parent 8441d53da4
commit 0bbed0fedb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/classic/goep_server.c
View File

@ -526,6 +526,8 @@ uint8_t goep_server_request_can_send_now(uint16_t goep_cid){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER; return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
} }
btstack_assert(connection->state == GOEP_SERVER_CONNECTED);
switch (connection->type){ switch (connection->type){
case GOEP_CONNECTION_RFCOMM: case GOEP_CONNECTION_RFCOMM:
rfcomm_request_can_send_now_event(connection->bearer_cid); rfcomm_request_can_send_now_event(connection->bearer_cid);
@ -561,6 +563,7 @@ static uint16_t goep_server_get_outgoing_buffer_len(goep_server_connection_t * c
} }
static void goep_server_packet_init(goep_server_connection_t * connection){ static void goep_server_packet_init(goep_server_connection_t * connection){
btstack_assert(connection->state == GOEP_SERVER_CONNECTED);
switch (connection->type){ switch (connection->type){
#ifdef ENABLE_GOEP_L2CAP #ifdef ENABLE_GOEP_L2CAP
case GOEP_CONNECTION_L2CAP: case GOEP_CONNECTION_L2CAP:
@ -573,6 +576,7 @@ static void goep_server_packet_init(goep_server_connection_t * connection){
btstack_unreachable(); btstack_unreachable();
break; break;
} }
connection->state = GOEP_SERVER_OUTGOING_BUFFER_RESERVED;
} }
uint8_t goep_server_response_create_connect(uint16_t goep_cid, uint8_t obex_version_number, uint8_t flags, uint16_t maximum_obex_packet_length){ uint8_t goep_server_response_create_connect(uint16_t goep_cid, uint8_t obex_version_number, uint8_t flags, uint16_t maximum_obex_packet_length){
@ -663,8 +667,10 @@ uint8_t goep_server_execute(uint16_t goep_cid, uint8_t response_code){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER; return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
} }
connection->state = GOEP_SERVER_CONNECTED;
uint8_t * buffer = goep_server_get_outgoing_buffer(connection); uint8_t * buffer = goep_server_get_outgoing_buffer(connection);
// set reponse code // set response code
buffer[0] = response_code; buffer[0] = response_code;
uint16_t pos = big_endian_read_16(buffer, 1); uint16_t pos = big_endian_read_16(buffer, 1);
switch (connection->type) { switch (connection->type) {

3
src/classic/goep_server.h
View File

@ -57,7 +57,8 @@ typedef enum {
GOEP_SERVER_IDLE, GOEP_SERVER_IDLE,
GOEP_SERVER_W4_ACCEPT_REJECT, GOEP_SERVER_W4_ACCEPT_REJECT,
GOEP_SERVER_W4_CONNECTED, GOEP_SERVER_W4_CONNECTED,
GOEP_SERVER_CONNECTED GOEP_SERVER_CONNECTED,
GOEP_SERVER_OUTGOING_BUFFER_RESERVED,
} goep_server_state_t; } goep_server_state_t;
typedef enum { typedef enum {