korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-03 00:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools/btmgmt: Fix address type in user confirm replies

Browse Source
This commit is contained in:
Johan Hedberg 2014-05-27 20:58:28 +03:00
parent 3c3e8a8b73
commit 2790b3b250
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/btmgmt.c
View File

@ -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, 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; struct mgmt_cp_user_confirm_reply cp;
memset(&cp, 0, sizeof(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, return mgmt_reply(mgmt, MGMT_OP_USER_CONFIRM_REPLY, index,
sizeof(cp), &cp, confirm_rsp, NULL, NULL); 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, 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; struct mgmt_cp_user_confirm_reply cp;
memset(&cp, 0, sizeof(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, return mgmt_reply(mgmt, MGMT_OP_USER_CONFIRM_NEG_REPLY, index,
sizeof(cp), &cp, confirm_neg_rsp, NULL, NULL); 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)); memset(rsp, 0, sizeof(rsp));
if (fgets(rsp, sizeof(rsp), stdin) == NULL || rsp[0] == '\n') { 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; return;
} }
@ -618,9 +618,9 @@ static void user_confirm(uint16_t index, uint16_t len, const void *param,
rsp[rsp_len - 1] = '\0'; rsp[rsp_len - 1] = '\0';
if (rsp[0] == 'y' || rsp[0] == 'Y') if (rsp[0] == 'y' || rsp[0] == 'Y')
mgmt_confirm_reply(mgmt, index, &ev->addr.bdaddr); mgmt_confirm_reply(mgmt, index, &ev->addr);
else 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, static void cmd_monitor(struct mgmt *mgmt, uint16_t index, int argc,