michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Simplify pin_code_reply function

Browse source 
Move PIN checks up to caller and make pin_code_reply handle just
HCI command.

Change-Id: I159aada8f097407d8ccdc53031ea280e69204091
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2016-01-11 16:18:27 +01:00 • committed by Anas Nashif
commit 64450f1933
1 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
net/bluetooth/hci_core.c
View file

@ -1584,52 +1584,25 @@ static int pin_code_neg_reply(const bt_addr_t *bdaddr)
return bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_NEG_REPLY, buf, NULL); return bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_NEG_REPLY, buf, NULL);
} }
static int pin_code_reply(const bt_addr_t *bdaddr, const char *pin) static int pin_code_reply(struct bt_conn *conn, const char *pin, uint8_t len)
{ {
struct bt_hci_cp_pin_code_reply *cp; struct bt_hci_cp_pin_code_reply *cp;
struct bt_conn *conn;
struct net_buf *buf; struct net_buf *buf;
size_t len;
int err;
BT_DBG(""); BT_DBG("");
conn = bt_conn_lookup_addr_br(bdaddr);
if (!conn) {
BT_ERR("Can't find conn for %s", bt_addr_str(bdaddr));
return -EINVAL;
}
len = strlen(pin);
if (len > 16) {
err = -EINVAL;
goto cleanup;
}
if (conn->required_sec_level == BT_SECURITY_HIGH && len < 16) {
BT_WARN("PIN code for %s is not 16 bytes wide",
bt_addr_str(bdaddr));
bt_conn_unref(conn);
return pin_code_neg_reply(bdaddr);
}
buf = bt_hci_cmd_create(BT_HCI_OP_PIN_CODE_REPLY, sizeof(*cp)); buf = bt_hci_cmd_create(BT_HCI_OP_PIN_CODE_REPLY, sizeof(*cp));
if (!buf) { if (!buf) {
err = -ENOBUFS; return -ENOBUFS;
goto cleanup;
} }
cp = net_buf_add(buf, sizeof(*cp)); cp = net_buf_add(buf, sizeof(*cp));
memset(cp, 0, sizeof(*cp));
bt_addr_copy(&cp->bdaddr, bdaddr); bt_addr_copy(&cp->bdaddr, &conn->br.dst);
cp->pin_len = len; cp->pin_len = len;
strncpy(cp->pin_code, pin, len); strncpy(cp->pin_code, pin, sizeof(cp->pin_code));
err = bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_REPLY, buf, NULL); return bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_REPLY, buf, NULL);
cleanup:
bt_conn_unref(conn);
return err;
} }
static void link_key_notify(struct net_buf *buf) static void link_key_notify(struct net_buf *buf)
@ -2732,13 +2705,30 @@ void bt_auth_cancel(struct bt_conn *conn)
#if defined(CONFIG_BLUETOOTH_BREDR) #if defined(CONFIG_BLUETOOTH_BREDR)
void bt_auth_pincode_entry(struct bt_conn *conn, const char *pin) void bt_auth_pincode_entry(struct bt_conn *conn, const char *pin)
{ {
size_t len;
if (!bt_auth) { if (!bt_auth) {
return; return;
} }
if (conn->type == BT_CONN_TYPE_BR) { if (conn->type != BT_CONN_TYPE_BR) {
pin_code_reply(&conn->br.dst, pin); return;
} }
len = strlen(pin);
if (len > 16) {
pin_code_neg_reply(&conn->br.dst);
return;
}
if (conn->required_sec_level == BT_SECURITY_HIGH && len < 16) {
BT_WARN("PIN code for %s is not 16 bytes wide",
bt_addr_str(&conn->br.dst));
pin_code_neg_reply(&conn->br.dst);
return;
}
pin_code_reply(conn, pin, len);
} }
#endif #endif
#endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */ #endif /* CONFIG_BLUETOOTH_SMP || CONFIG_BLUETOOTH_BREDR */