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

fix io cap lookup, ble_peripheral has display

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-01-07 10:14:30 +00:00
parent 3266f4203f
commit f30cb1ae00
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ble/sm.c
View File

@ -362,7 +362,7 @@ static void sm_truncate_key(sm_key_t key, int max_encryption_size){
// established. // established.
static void sm_timeout_handler(timer_source_t * timer){ static void sm_timeout_handler(timer_source_t * timer){
printf("SM timeout"); printf("SM timeout\n");
sm_state_responding = SM_STATE_TIMEOUT; sm_state_responding = SM_STATE_TIMEOUT;
} }
static void sm_timeout_start(){ static void sm_timeout_start(){
@ -556,7 +556,9 @@ static void sm_tk_setup(){
// Otherwise the IO capabilities of the devices shall be used to determine the // Otherwise the IO capabilities of the devices shall be used to determine the
// pairing method as defined in Table 2.4. // pairing method as defined in Table 2.4.
sm_stk_generation_method = stk_generation_method[sm_m_io_capabilities][sm_s_io_capabilities]; sm_stk_generation_method = stk_generation_method[sm_s_io_capabilities][sm_m_io_capabilities];
printf("sm_tk_setup: master io cap: %u, slave io cap: %u -> method %u\n",
sm_m_io_capabilities, sm_s_io_capabilities, sm_stk_generation_method);
} }
static int sm_key_distribution_flags_for_set(uint8_t key_set){ static int sm_key_distribution_flags_for_set(uint8_t key_set){
@ -1107,6 +1109,7 @@ static void sm_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pac
// decide on STK generation method // decide on STK generation method
sm_tk_setup(); sm_tk_setup();
printf("SMP: generation method %u\n", sm_stk_generation_method);
// check if STK generation method is acceptable by client // check if STK generation method is acceptable by client
int ok = 0; int ok = 0;

19
example/libusb/ble_peripheral.c
View File

@ -156,6 +156,18 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
break; break;
} }
break; break;
case SM_PASSKEY_DISPLAY_NUMBER: {
// display number
sm_event_t * event = (sm_event_t *) packet;
printf("GAP Bonding: Display Passkey '%u\n", event->passkey);
break;
}
case SM_PASSKEY_DISPLAY_CANCEL:
printf("GAP Bonding: Display cancel\n");
break;
case SM_AUTHORIZATION_REQUEST: { case SM_AUTHORIZATION_REQUEST: {
// auto-authorize connection if requested // auto-authorize connection if requested
sm_event_t * event = (sm_event_t *) packet; sm_event_t * event = (sm_event_t *) packet;
@ -189,10 +201,10 @@ void setup(void){
// setup central device db // setup central device db
central_device_db_init(); central_device_db_init();
// setup SM // setup SM: Display only
sm_init(); sm_init();
sm_set_io_capabilities(IO_CAPABILITY_NO_INPUT_NO_OUTPUT); sm_set_io_capabilities(IO_CAPABILITY_DISPLAY_ONLY);
sm_set_authentication_requirements( SM_AUTHREQ_BONDING ); sm_set_authentication_requirements( SM_AUTHREQ_BONDING | SM_AUTHREQ_MITM_PROTECTION);
sm_set_request_security(1); sm_set_request_security(1);
// setup ATT server // setup ATT server
@ -211,7 +223,6 @@ int main(void)
run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS); run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
run_loop_add_timer(&heartbeat); run_loop_add_timer(&heartbeat);
// turn on! // turn on!
hci_power_control(HCI_POWER_ON); hci_power_control(HCI_POWER_ON);