mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-30 06:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

goep_client: add goep_client_connect_l2cap with provided l2cap psm

Browse Source
This commit is contained in:
Matthias Ringwald 2023-04-24 17:03:09 +02:00
parent 5621068838
commit ec9ab95169
2 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/classic/goep_client.c
View File

@ -243,6 +243,18 @@ static void goep_client_handle_sdp_query_end_of_record(goep_client_t * goep_clie
}
}
}
static uint8_t goep_client_start_connect(goep_client_t * goep_client){
#ifdef ENABLE_GOEP_L2CAP
if (goep_client->l2cap_psm){
log_info("Remote GOEP L2CAP PSM: %u", goep_client->l2cap_psm);
return l2cap_ertm_create_channel(&goep_client_packet_handler, goep_client->bd_addr, goep_client->l2cap_psm,
&goep_client->ertm_config, goep_client->ertm_buffer,
goep_client->ertm_buffer_size, &goep_client->bearer_cid);
}
#endif
log_info("Remote GOEP RFCOMM Server Channel: %u", goep_client->rfcomm_port);
return rfcomm_create_channel(&goep_client_packet_handler, goep_client->bd_addr, goep_client->rfcomm_port, &goep_client->bearer_cid);
}
static void goep_client_handle_sdp_query_event(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
goep_client_t * goep_client = goep_client_sdp_active;
@ -389,17 +401,7 @@ static void goep_client_handle_sdp_query_event(uint8_t packet_type, uint16_t cha
goep_client_emit_connected_event(goep_client, SDP_SERVICE_NOT_FOUND);
break;
}
#ifdef ENABLE_GOEP_L2CAP
if (goep_client->l2cap_psm){
log_info("Remote GOEP L2CAP PSM: %u", goep_client->l2cap_psm);
l2cap_ertm_create_channel(&goep_client_packet_handler, goep_client->bd_addr, goep_client->l2cap_psm,
&goep_client->ertm_config, goep_client->ertm_buffer,
goep_client->ertm_buffer_size, &goep_client->bearer_cid);
return;
}
#endif
log_info("Remote GOEP RFCOMM Server Channel: %u", goep_client->rfcomm_port);
rfcomm_create_channel(&goep_client_packet_handler, goep_client->bd_addr, goep_client->rfcomm_port, &goep_client->bearer_cid);
(void) goep_client_start_connect(goep_client);
break;
default:
@ -492,6 +494,39 @@ goep_client_connect(goep_client_t *goep_client, l2cap_ertm_config_t *l2cap_ertm_
return ERROR_CODE_SUCCESS;
}
#ifdef ENABLE_GOEP_L2CAP
uint8_t goep_client_connect_l2cap(goep_client_t *goep_client, l2cap_ertm_config_t *l2cap_ertm_config, uint8_t *l2cap_ertm_buffer,
uint16_t l2cap_ertm_buffer_size, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t l2cap_psm,
uint16_t *out_cid){
// get new goep cid, skip 0x0000
goep_client_cid++;
if (goep_client_cid == 0) {
goep_client_cid = 1;
}
// add to list
memset(goep_client, 0, sizeof(goep_client_t));
goep_client->state = GOEP_CLIENT_W4_SDP;
goep_client->cid = goep_client_cid;
goep_client->client_handler = handler;
goep_client->profile_supported_features = PROFILE_FEATURES_NOT_PRESENT;
(void)memcpy(goep_client->bd_addr, addr, 6);
goep_client->sdp_query_request.callback = geop_client_sdp_query_start;
goep_client->sdp_query_request.context = (void *)(uintptr_t) goep_client->cid;
goep_client->obex_connection_id = OBEX_CONNECTION_ID_INVALID;
memcpy(&goep_client->ertm_config, l2cap_ertm_config, sizeof(l2cap_ertm_config_t));
goep_client->ertm_buffer_size = l2cap_ertm_buffer_size;
goep_client->ertm_buffer = l2cap_ertm_buffer;
btstack_linked_list_add(&goep_clients, (btstack_linked_item_t *) goep_client);
goep_client->l2cap_psm = l2cap_psm;
*out_cid = goep_client->cid;
return goep_client_start_connect(goep_client);
}
#endif
uint8_t goep_client_create_connection(btstack_packet_handler_t handler, bd_addr_t addr, uint16_t uuid, uint16_t * out_cid){
goep_client_t * goep_client = &goep_client_singleton;
if (goep_client->state != GOEP_CLIENT_INIT) {

19
src/classic/goep_client.h
View File

@ -140,6 +140,25 @@ goep_client_connect(goep_client_t *goep_client, l2cap_ertm_config_t *l2cap_ertm_
uint16_t l2cap_ertm_buffer_size, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t uuid,
uint8_t instance_id, uint16_t *out_cid);
/**
* @brief Connect to a GEOP server over L2CAP with specified PSM on a remote device.
* @note In contrast to goep_client_connect which searches for a OBEX service with a given UUID, this
* function only supports GOEP v2.0 (L2CAP) to a specified L2CAP PSM
* @param goep_client
* @param l2cap_ertm_config
* @param l2cap_ertm_buffer_size
* @param l2cap_ertm_buffer
* @param handler
* @param addr
* @param l2cap_psm
* @param out_cid
* @return
*/
uint8_t
goep_client_connect_l2cap(goep_client_t *goep_client, l2cap_ertm_config_t *l2cap_ertm_config, uint8_t *l2cap_ertm_buffer,
uint16_t l2cap_ertm_buffer_size, btstack_packet_handler_t handler, bd_addr_t addr, uint16_t l2cap_psm,
uint16_t *out_cid);
/*
* @brief Connect to a GEOP server with specified UUID on a remote device.
* @note This functions uses a single goep_client_t instance and only allows for a single goep connection