From 2790b3b25006b9112f1d361b7aea786ed449858c Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 27 May 2014 20:58:28 +0300 Subject: [PATCH] tools/btmgmt: Fix address type in user confirm replies --- tools/btmgmt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 0618de177..4c393ce3b 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -538,12 +538,12 @@ static void confirm_rsp(uint8_t status, uint16_t len, const void *param, } static int mgmt_confirm_reply(struct mgmt *mgmt, uint16_t index, - const bdaddr_t *bdaddr) + const struct mgmt_addr_info *addr) { struct mgmt_cp_user_confirm_reply cp; memset(&cp, 0, sizeof(cp)); - bacpy(&cp.addr.bdaddr, bdaddr); + memcpy(&cp.addr, addr, sizeof(*addr)); return mgmt_reply(mgmt, MGMT_OP_USER_CONFIRM_REPLY, index, sizeof(cp), &cp, confirm_rsp, NULL, NULL); @@ -564,12 +564,12 @@ static void confirm_neg_rsp(uint8_t status, uint16_t len, const void *param, } static int mgmt_confirm_neg_reply(struct mgmt *mgmt, uint16_t index, - const bdaddr_t *bdaddr) + const struct mgmt_addr_info *addr) { struct mgmt_cp_user_confirm_reply cp; memset(&cp, 0, sizeof(cp)); - bacpy(&cp.addr.bdaddr, bdaddr); + memcpy(&cp.addr, addr, sizeof(*addr)); return mgmt_reply(mgmt, MGMT_OP_USER_CONFIRM_NEG_REPLY, index, sizeof(cp), &cp, confirm_neg_rsp, NULL, NULL); @@ -609,7 +609,7 @@ static void user_confirm(uint16_t index, uint16_t len, const void *param, memset(rsp, 0, sizeof(rsp)); if (fgets(rsp, sizeof(rsp), stdin) == NULL || rsp[0] == '\n') { - mgmt_confirm_neg_reply(mgmt, index, &ev->addr.bdaddr); + mgmt_confirm_neg_reply(mgmt, index, &ev->addr); return; } @@ -618,9 +618,9 @@ static void user_confirm(uint16_t index, uint16_t len, const void *param, rsp[rsp_len - 1] = '\0'; if (rsp[0] == 'y' || rsp[0] == 'Y') - mgmt_confirm_reply(mgmt, index, &ev->addr.bdaddr); + mgmt_confirm_reply(mgmt, index, &ev->addr); else - mgmt_confirm_neg_reply(mgmt, index, &ev->addr.bdaddr); + mgmt_confirm_neg_reply(mgmt, index, &ev->addr); } static void cmd_monitor(struct mgmt *mgmt, uint16_t index, int argc, -- 2.47.3