mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-06 12:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

pts: support address resolution for privacy modes

Browse Source
This commit is contained in:
Matthias Ringwald 2015-08-04 14:41:14 +02:00
parent 46452f47d3
commit b92e92b749
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/pts/ble_central_test.c
View File

@ -158,8 +158,14 @@ static void handle_advertising_event(uint8_t * packet, int size){
// filter PTS // filter PTS
bd_addr_t addr; bd_addr_t addr;
bt_flip_addr(addr, &packet[4]); bt_flip_addr(addr, &packet[4]);
if (memcmp(addr, public_pts_address, 6)) return;
printf("Advertisement: %s, ", ad_event_types[packet[2]]); // always request address resolution
sm_address_resolution_lookup(packet[3], addr);
// ignore advertisement from devices other than pts
if (memcmp(addr, current_pts_address, 6)) return;
printf("Advertisement: %s - %s, ", bd_addr_to_str(addr), ad_event_types[packet[2]]);
int adv_size = packet[11]; int adv_size = packet[11];
uint8_t * adv_data = &packet[12]; uint8_t * adv_data = &packet[12];
@ -216,6 +222,7 @@ static void gap_run(void){
} }
void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
uint16_t aHandle;
switch (packet_type) { switch (packet_type) {
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
@ -243,6 +250,8 @@ void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet,
break; break;
case HCI_EVENT_DISCONNECTION_COMPLETE: case HCI_EVENT_DISCONNECTION_COMPLETE:
aHandle = READ_BT_16(packet, 3);
printf("Disconnected from handle 0x%04x\n", aHandle);
break; break;
case SM_PASSKEY_INPUT_NUMBER: { case SM_PASSKEY_INPUT_NUMBER: {
@ -271,7 +280,8 @@ void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet,
case SM_JUST_WORKS_REQUEST: case SM_JUST_WORKS_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;
// TODO: check address
sm_just_works_confirm(current_pts_address_type, current_pts_address); sm_just_works_confirm(current_pts_address_type, current_pts_address);
printf("Just Works request confirmed\n"); printf("Just Works request confirmed\n");
break; break;
@ -280,7 +290,8 @@ void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet,
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; // TODO: check address
// sm_event_t * event = (sm_event_t *) packet;
sm_authorization_grant(current_pts_address_type, current_pts_address); sm_authorization_grant(current_pts_address_type, current_pts_address);
break; break;
} }
@ -288,6 +299,15 @@ void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet,
case GAP_LE_ADVERTISING_REPORT: case GAP_LE_ADVERTISING_REPORT:
handle_advertising_event(packet, size); handle_advertising_event(packet, size);
break; break;
case SM_IDENTITY_RESOLVING_SUCCEEDED:
// skip already detected pts
if (memcmp( ((sm_event_t*) packet)->address, current_pts_address, 6) == 0) break;
memcpy(current_pts_address, ((sm_event_t*) packet)->address, 6);
current_pts_address_type = ((sm_event_t*) packet)->addr_type;
printf("Address resolving succeeded: resolvable address %s, addr type %u\n",
bd_addr_to_str(current_pts_address), current_pts_address_type);
break;
default: default:
break; break;
} }
@ -379,12 +399,18 @@ uint16_t attribute_size = 1;
int scanning_active = 0; int scanning_active = 0;
void show_usage(void){ void show_usage(void){
uint8_t iut_address_type;
bd_addr_t iut_address;
hci_le_advertisement_address(&iut_address_type, iut_address);
printf("\e[1;1H\e[2J"); printf("\e[1;1H\e[2J");
printf("--- CLI for LE Central ---\n"); printf("--- CLI for LE Central ---\n");
printf("PTS: addr type %u, addr %s\n", current_pts_address_type, bd_addr_to_str(current_pts_address));
printf("IUT: addr type %u, addr %s\n", iut_address_type, bd_addr_to_str(iut_address));
printf("--------------------------\n");
printf("GAP: connectable %u\n", gap_connectable); printf("GAP: connectable %u\n", gap_connectable);
printf("SM: %s, MITM protection %u, OOB data %u, key range [%u..16]\n", printf("SM: %s, MITM protection %u, OOB data %u, key range [%u..16]\n",
sm_io_capabilities, sm_mitm_protection, sm_have_oob_data, sm_min_key_size); sm_io_capabilities, sm_mitm_protection, sm_have_oob_data, sm_min_key_size);
printf("PTS: addr type %u, addr %s\n", current_pts_address_type, current_pts_address);
printf("Privacy %u\n", gap_privacy); printf("Privacy %u\n", gap_privacy);
printf("Device name: %s\n", gap_device_name); printf("Device name: %s\n", gap_device_name);
printf("Value Handle: %x\n", value_handle); printf("Value Handle: %x\n", value_handle);