mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-23 19:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

example: init SM if LE supported to avoid issue with Android Cross-Transport Key-Derivation

Browse Source
This commit is contained in:
Matthias Ringwald 2021-12-17 21:03:22 +01:00
parent 9d65c99253
commit 8c9bb29ec2
20 changed files with 112 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -12,6 +12,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
### Changed
## Release v1.5.1
### Fixed
- pbap_client: support disconnect while operation is ongoing
### Changed
- Example: init SM if LE supported to avoid issue with Android Cross-Transport Key-Derivation
## Release v1.5.0

7
example/a2dp_sink_demo.c
View File

@ -213,7 +213,14 @@ static void stdin_process(char cmd);
#endif
static int a2dp_and_avrcp_setup(void){
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// Initialize AVDTP Sink
a2dp_sink_init();
a2dp_sink_register_packet_handler(&a2dp_sink_packet_handler);

7
example/a2dp_source_demo.c
View File

@ -249,10 +249,17 @@ static void stdin_process(char cmd);
static void a2dp_demo_hexcmod_configure_sample_rate(int sample_rate);
static int a2dp_source_and_avrcp_services_init(void){
// Request role change on reconnecting headset to always use them in slave mode
hci_set_master_slave_policy(0);
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// Initialize A2DP Source
a2dp_source_init();
a2dp_source_register_packet_handler(&a2dp_source_packet_handler);

5
example/avrcp_browsing_client.c
View File

@ -246,6 +246,11 @@ int btstack_main(int argc, const char * argv[]){
// Initialize L2CAP.
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
a2dp_sink_init();
a2dp_sink_register_packet_handler(&a2dp_sink_packet_handler);

7
example/gap_dedicated_bonding.c
View File

@ -77,6 +77,13 @@ int btstack_main(int argc, const char * argv[]){
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// turn on!
hci_power_control(HCI_POWER_ON);

5
example/hfp_ag_demo.c
View File

@ -706,6 +706,11 @@ int btstack_main(int argc, const char * argv[]){
// L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
uint16_t supported_features =
(1<<HFP_AGSF_ESCO_S4) |
(1<<HFP_AGSF_HF_INDICATORS) |

5
example/hfp_hf_demo.c
View File

@ -684,6 +684,11 @@ int btstack_main(int argc, const char * argv[]){
// init L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
uint16_t hf_supported_features =
(1<<HFP_HFSF_ESCO_S4) |
(1<<HFP_HFSF_CLI_PRESENTATION_CAPABILITY) |

9
example/hid_host_demo.c
View File

@ -138,10 +138,15 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
static void hid_host_setup(void){
// Initialize L2CAP
// Initialize L2CAP
l2cap_init();
// Initialize HID Host
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// Initialize HID Host
hid_host_init(hid_descriptor_storage, sizeof(hid_descriptor_storage));
hid_host_register_packet_handler(packet_handler);

5
example/hid_keyboard_demo.c
View File

@ -408,6 +408,11 @@ int btstack_main(int argc, const char * argv[]){
// L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// SDP Server
sdp_init();
memset(hid_service_buffer, 0, sizeof(hid_service_buffer));

5
example/hid_mouse_demo.c
View File

@ -297,6 +297,11 @@ int btstack_main(int argc, const char * argv[]){
// L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// SDP Server
sdp_init();
memset(hid_service_buffer, 0, sizeof(hid_service_buffer));

5
example/hsp_ag_demo.c
View File

@ -295,6 +295,11 @@ int btstack_main(int argc, const char * argv[]){
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
sdp_init();
memset((uint8_t *)hsp_service_buffer, 0, sizeof(hsp_service_buffer));

5
example/hsp_hs_demo.c
View File

@ -277,6 +277,11 @@ int btstack_main(int argc, const char * argv[]){
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
sdp_init();
memset(hsp_service_buffer, 0, sizeof(hsp_service_buffer));
hsp_hs_create_sdp_record(hsp_service_buffer, 0x10001, rfcomm_channel_nr, hsp_hs_service_name, 0);

5
example/pan_lwip_http_server.c
View File

@ -175,6 +175,11 @@ static void pan_bnep_setup(void){
// Initialize L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// Initialize BNEP
bnep_init();

6
example/panu_demo.c
View File

@ -112,9 +112,13 @@ static void network_send_packet_callback(const uint8_t * packet, uint16_t size);
static void panu_setup(void){
// Initialize L2CAP
// Initialize L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// init SDP, create record for PANU and register with SDP
sdp_init();

15
example/pbap_client_demo.c
View File

@ -54,12 +54,7 @@
#include <stdlib.h>
#include <string.h>
#include "btstack_run_loop.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
#include "btstack_event.h"
#include "classic/goep_client.h"
#include "classic/pbap_client.h"
#include "btstack.h"
#ifdef HAVE_BTSTACK_STDIN
#include "btstack_stdin.h"
@ -370,13 +365,17 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
int btstack_main(int argc, const char * argv[]);
int btstack_main(int argc, const char * argv[]){
(void)argc;
(void)argv;
// init L2CAP
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
// init RFCOM
rfcomm_init();

5
example/spp_counter.c
View File

@ -90,6 +90,11 @@ static void spp_service_setup(void){
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
rfcomm_init();
rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff); // reserved channel, mtu limited by l2cap

7
example/spp_flowcontrol.c
View File

@ -200,6 +200,13 @@ int btstack_main(int argc, const char * argv[]){
(void)argc;
(void)argv;
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
spp_service_setup();
one_shot_timer_setup();

5
example/spp_streamer.c
View File

@ -283,6 +283,11 @@ int btstack_main(int argc, const char * argv[])
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
rfcomm_init();
rfcomm_register_service(packet_handler, RFCOMM_SERVER_CHANNEL, 0xffff);

5
example/spp_streamer_client.c
View File

@ -392,6 +392,11 @@ int btstack_main(int argc, const char * argv[]){
l2cap_init();
#ifdef ENABLE_BLE
// Initialize LE Security Manager. Needed for cross-transport key derivation
sm_init();
#endif
rfcomm_init();
#ifdef ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE_FOR_RFCOMM

2
src/btstack.h
View File

@ -129,6 +129,7 @@
#include "classic/btstack_sbc.h"
#include "classic/device_id_server.h"
#include "classic/gatt_sdp.h"
#include "classic/goep_client.h"
#include "classic/hfp.h"
#include "classic/hfp_ag.h"
#include "classic/hfp_hf.h"
@ -137,6 +138,7 @@
#include "classic/hsp_ag.h"
#include "classic/hsp_hs.h"
#include "classic/pan.h"
#include "classic/pbap_client.h"
#include "classic/rfcomm.h"
#include "classic/sdp_client.h"
#include "classic/sdp_client_rfcomm.h"