Skip to content

apps/bttester: fix address lookup in gap_conn_find_by_addr #2284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piotrnarajowski wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −30
Open

apps/bttester: fix address lookup in gap_conn_find_by_addr #2284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 9 additions & 30 deletions apps/bttester/src/btp_gap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ static struct ble_sm_sc_oob_data oob_data_remote;

static uint16_t current_settings;
uint8_t own_addr_type;
static ble_addr_t peer_id_addr;
static ble_addr_t peer_ota_addr;
static bool encrypted = false;

static bool use_filter_policy = false;
Expand Down Expand Up @@ -94,29 +92,19 @@ gap_conn_find_by_addr(const ble_addr_t *dev_addr,
struct ble_gap_conn_desc *out_desc)
{
ble_addr_t addr = *dev_addr;
int rc;

if (memcmp(BLE_ADDR_ANY, &peer_id_addr, 6) == 0) {
return ble_gap_conn_find_by_addr(&addr, out_desc);
rc = ble_gap_conn_find_by_addr(&addr, out_desc);
if (rc == 0) {
return 0;
}

if (BLE_ADDR_IS_RPA(&addr)) {
if (ble_addr_cmp(&peer_ota_addr, &addr) != 0) {
return -1;
}

return ble_gap_conn_find_by_addr(&addr, out_desc);
} else {
if (ble_addr_cmp(&peer_id_addr, &addr) != 0) {
return -1;
}

if (BLE_ADDR_IS_RPA(&peer_ota_addr)) {
/* Change addr type to ID addr */
addr.type |= 2;
}

return ble_gap_conn_find_by_addr(&addr, out_desc);
if ((addr.type & BLE_ADDR_PUBLIC_ID) == 0) {
addr.type |= BLE_ADDR_PUBLIC_ID;
rc = ble_gap_conn_find_by_addr(&addr, out_desc);
}

return rc;
}

static int
Expand Down Expand Up @@ -869,9 +857,6 @@ le_connected(uint16_t conn_handle, int status)
return;
}

peer_id_addr = desc.peer_id_addr;
peer_ota_addr = desc.peer_ota_addr;

addr = &desc.peer_id_addr;

memcpy(&connected_ev.address, addr, sizeof(connected_ev.address));
Expand Down Expand Up @@ -1101,9 +1086,6 @@ le_identity_resolved(uint16_t conn_handle)
return;
}

peer_id_addr = desc.peer_id_addr;
peer_ota_addr = desc.peer_ota_addr;

memcpy(&ev.address, &desc.peer_ota_addr, sizeof(ev.address));

memcpy(&ev.identity_address, &desc.peer_id_addr,
Expand All @@ -1127,9 +1109,6 @@ le_pairing_failed(uint16_t conn_handle, int reason)
return;
}

peer_id_addr = desc.peer_id_addr;
peer_ota_addr = desc.peer_ota_addr;

memcpy(&ev.address, &desc.peer_ota_addr, sizeof(ev.address));

ev.reason = reason;
Expand Down
Loading