diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-01-25 06:28:33 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-07 22:40:08 -0500 |
commit | 17fa4b9dff72fb3a1a68cc80caf98fc941d2b8b3 (patch) | |
tree | 34febcb1be7bf64995dd94c5db5755c5d9d7754f /net/bluetooth | |
parent | 980e1a537fed7dfa53e9a4b6e586b43341f8c2d5 (diff) |
Bluetooth: Add set_io_capability management command
This patch adds a new set_io_capability management command which is used
to set the IO capability for Secure Simple Pairing (SSP) as well as the
Security Manager Protocol (SMP). The value is per hci_dev and each
hci_conn object inherits it upon creation.
Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_conn.c | 1 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 1 | ||||
-rw-r--r-- | net/bluetooth/hci_event.c | 30 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 32 |
4 files changed, 62 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 99cd8d9d891b..42dc39f25b72 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -234,6 +234,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) | |||
234 | conn->mode = HCI_CM_ACTIVE; | 234 | conn->mode = HCI_CM_ACTIVE; |
235 | conn->state = BT_OPEN; | 235 | conn->state = BT_OPEN; |
236 | conn->auth_type = HCI_AT_GENERAL_BONDING; | 236 | conn->auth_type = HCI_AT_GENERAL_BONDING; |
237 | conn->io_capability = hdev->io_capability; | ||
237 | 238 | ||
238 | conn->power_save = 1; | 239 | conn->power_save = 1; |
239 | conn->disc_timeout = HCI_DISCONN_TIMEOUT; | 240 | conn->disc_timeout = HCI_DISCONN_TIMEOUT; |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8ca8cf147058..bf6729a53378 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1084,6 +1084,7 @@ int hci_register_dev(struct hci_dev *hdev) | |||
1084 | hdev->pkt_type = (HCI_DM1 | HCI_DH1 | HCI_HV1); | 1084 | hdev->pkt_type = (HCI_DM1 | HCI_DH1 | HCI_HV1); |
1085 | hdev->esco_type = (ESCO_HV1); | 1085 | hdev->esco_type = (ESCO_HV1); |
1086 | hdev->link_mode = (HCI_LM_ACCEPT); | 1086 | hdev->link_mode = (HCI_LM_ACCEPT); |
1087 | hdev->io_capability = 0x03; /* No Input No Output */ | ||
1087 | 1088 | ||
1088 | hdev->idle_timeout = 0; | 1089 | hdev->idle_timeout = 0; |
1089 | hdev->sniff_max_interval = 800; | 1090 | hdev->sniff_max_interval = 800; |
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 98bcf78f2021..617f58363dbc 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -2198,6 +2198,25 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct | |||
2198 | hci_dev_unlock(hdev); | 2198 | hci_dev_unlock(hdev); |
2199 | } | 2199 | } |
2200 | 2200 | ||
2201 | static inline u8 hci_get_auth_req(struct hci_conn *conn) | ||
2202 | { | ||
2203 | /* If remote requests dedicated bonding follow that lead */ | ||
2204 | if (conn->remote_auth == 0x02 || conn->remote_auth == 0x03) { | ||
2205 | /* If both remote and local IO capabilities allow MITM | ||
2206 | * protection then require it, otherwise don't */ | ||
2207 | if (conn->remote_cap == 0x03 || conn->io_capability == 0x03) | ||
2208 | return 0x02; | ||
2209 | else | ||
2210 | return 0x03; | ||
2211 | } | ||
2212 | |||
2213 | /* If remote requests no-bonding follow that lead */ | ||
2214 | if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01) | ||
2215 | return 0x00; | ||
2216 | |||
2217 | return conn->auth_type; | ||
2218 | } | ||
2219 | |||
2201 | static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | 2220 | static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) |
2202 | { | 2221 | { |
2203 | struct hci_ev_io_capa_request *ev = (void *) skb->data; | 2222 | struct hci_ev_io_capa_request *ev = (void *) skb->data; |
@@ -2218,8 +2237,15 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff | |||
2218 | 2237 | ||
2219 | if (test_bit(HCI_PAIRABLE, &hdev->flags) || | 2238 | if (test_bit(HCI_PAIRABLE, &hdev->flags) || |
2220 | (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) { | 2239 | (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) { |
2221 | /* FIXME: Do IO capa response based on information | 2240 | struct hci_cp_io_capability_reply cp; |
2222 | * provided through the management interface */ | 2241 | |
2242 | bacpy(&cp.bdaddr, &ev->bdaddr); | ||
2243 | cp.capability = conn->io_capability; | ||
2244 | cp.oob_data = 0; | ||
2245 | cp.authentication = hci_get_auth_req(conn); | ||
2246 | |||
2247 | hci_send_cmd(hdev, HCI_OP_IO_CAPABILITY_REPLY, | ||
2248 | sizeof(cp), &cp); | ||
2223 | } else { | 2249 | } else { |
2224 | struct hci_cp_io_capability_neg_reply cp; | 2250 | struct hci_cp_io_capability_neg_reply cp; |
2225 | 2251 | ||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 3800aaf5792d..b2bda83050a4 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -1016,6 +1016,35 @@ failed: | |||
1016 | return err; | 1016 | return err; |
1017 | } | 1017 | } |
1018 | 1018 | ||
1019 | static int set_io_capability(struct sock *sk, unsigned char *data, u16 len) | ||
1020 | { | ||
1021 | struct hci_dev *hdev; | ||
1022 | struct mgmt_cp_set_io_capability *cp; | ||
1023 | u16 dev_id; | ||
1024 | |||
1025 | BT_DBG(""); | ||
1026 | |||
1027 | cp = (void *) data; | ||
1028 | dev_id = get_unaligned_le16(&cp->index); | ||
1029 | |||
1030 | hdev = hci_dev_get(dev_id); | ||
1031 | if (!hdev) | ||
1032 | return cmd_status(sk, MGMT_OP_SET_IO_CAPABILITY, ENODEV); | ||
1033 | |||
1034 | hci_dev_lock_bh(hdev); | ||
1035 | |||
1036 | hdev->io_capability = cp->io_capability; | ||
1037 | |||
1038 | BT_DBG("%s IO capability set to 0x%02x", hdev->name, | ||
1039 | hdev->io_capability); | ||
1040 | |||
1041 | hci_dev_unlock_bh(hdev); | ||
1042 | hci_dev_put(hdev); | ||
1043 | |||
1044 | return cmd_complete(sk, MGMT_OP_SET_IO_CAPABILITY, | ||
1045 | &dev_id, sizeof(dev_id)); | ||
1046 | } | ||
1047 | |||
1019 | int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) | 1048 | int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) |
1020 | { | 1049 | { |
1021 | unsigned char *buf; | 1050 | unsigned char *buf; |
@@ -1098,6 +1127,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) | |||
1098 | case MGMT_OP_PIN_CODE_NEG_REPLY: | 1127 | case MGMT_OP_PIN_CODE_NEG_REPLY: |
1099 | err = pin_code_neg_reply(sk, buf + sizeof(*hdr), len); | 1128 | err = pin_code_neg_reply(sk, buf + sizeof(*hdr), len); |
1100 | break; | 1129 | break; |
1130 | case MGMT_OP_SET_IO_CAPABILITY: | ||
1131 | err = set_io_capability(sk, buf + sizeof(*hdr), len); | ||
1132 | break; | ||
1101 | default: | 1133 | default: |
1102 | BT_DBG("Unknown op %u", opcode); | 1134 | BT_DBG("Unknown op %u", opcode); |
1103 | err = cmd_status(sk, opcode, 0x01); | 1135 | err = cmd_status(sk, opcode, 0x01); |