From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv1 09/17] Bluetooth: A2MP: Process A2MP Discover Request
Date: Fri, 18 May 2012 17:25:42 +0300 [thread overview]
Message-ID: <1337351150-20526-10-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1337351150-20526-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Adds helper functions to count HCI devs and process A2MP Discover
Request, code makes sure that first controller in the list is
BREDR one. Trace is shown below:
...
> ACL data: handle 11 flags 0x02 dlen 16
A2MP: Discover req: mtu/mps 670 mask: 0x0000
< ACL data: handle 11 flags 0x00 dlen 22
A2MP: Discover rsp: mtu/mps 670 mask: 0x0000
Controller list:
id 0 type 0 (BR-EDR) status 0x01 (Bluetooth only)
id 1 type 1 (802.11 AMP) status 0x01 (Bluetooth only)
...
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/a2mp.h | 2 +
include/net/bluetooth/hci_core.h | 13 ++++++
net/bluetooth/a2mp.c | 85 ++++++++++++++++++++++++++++++++++++++
3 files changed, 100 insertions(+)
diff --git a/include/net/bluetooth/a2mp.h b/include/net/bluetooth/a2mp.h
index 1f93628..980c266 100644
--- a/include/net/bluetooth/a2mp.h
+++ b/include/net/bluetooth/a2mp.h
@@ -15,6 +15,8 @@
#ifndef __A2MP_H
#define __A2MP_H
+#define A2MP_FEAT_EXT 0x8000
+
struct amp_mgr {
struct list_head list;
struct l2cap_conn *l2cap_conn;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3d9b07f..612b93e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -641,6 +641,19 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
dev_set_drvdata(&hdev->dev, data);
}
+/* hci_dev_list shall be locked */
+static inline uint8_t __hci_num_ctrl(void)
+{
+ uint8_t count = 0;
+ struct list_head *p;
+
+ list_for_each(p, &hci_dev_list) {
+ count++;
+ }
+
+ return count;
+}
+
struct hci_dev *hci_dev_get(int index);
struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index a104f7a..ab6ef31 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -63,6 +63,36 @@ static void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len,
kfree(cmd);
}
+static inline void __a2mp_cl_bredr(struct a2mp_cl *cl)
+{
+ cl->id = 0;
+ cl->type = 0;
+ cl->status = 1;
+}
+
+/* hci_dev_list shall be locked */
+static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl)
+{
+ int i = 0;
+ struct hci_dev *hdev;
+
+ __a2mp_cl_bredr(cl);
+
+ list_for_each_entry(hdev, &hci_dev_list, list) {
+ /* Iterate through AMP controllers */
+ if (hdev->id == HCI_BREDR_ID)
+ continue;
+
+ /* Starting from second entry */
+ if (++i >= num_ctrl)
+ return;
+
+ cl[i].id = hdev->id;
+ cl[i].type = hdev->amp_type;
+ cl[i].status = hdev->amp_status;
+ }
+}
+
/* Processing A2MP messages */
static int a2mp_command_rej(struct amp_mgr *mgr, struct sk_buff *skb,
struct a2mp_cmd *hdr)
@@ -79,6 +109,58 @@ static int a2mp_command_rej(struct amp_mgr *mgr, struct sk_buff *skb,
return 0;
}
+static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb,
+ struct a2mp_cmd *hdr)
+{
+ struct a2mp_discov_req *req = (struct a2mp_discov_req *) skb->data;
+ u16 len = le16_to_cpu(hdr->len);
+ struct a2mp_discov_rsp *rsp;
+ u16 ext_feat;
+ u8 num_ctrl;
+
+ if (len < sizeof(*req))
+ return -EINVAL;
+
+ skb_pull(skb, sizeof(*req));
+
+ ext_feat = le16_to_cpu(req->ext_feat);
+
+ BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(req->mtu), ext_feat);
+
+ /* check that packet is not broken for now */
+ while (ext_feat & A2MP_FEAT_EXT) {
+ if (len < sizeof(ext_feat))
+ return -EINVAL;
+
+ ext_feat = get_unaligned_le16(skb->data);
+ BT_DBG("efm 0x%4.4x", ext_feat);
+ len -= sizeof(ext_feat);
+ skb_pull(skb, sizeof(ext_feat));
+ }
+
+ read_lock(&hci_dev_list_lock);
+
+ num_ctrl = __hci_num_ctrl();
+ len = num_ctrl * sizeof(struct a2mp_cl) + sizeof(*rsp);
+ rsp = kmalloc(len, GFP_ATOMIC);
+ if (!rsp) {
+ read_unlock(&hci_dev_list_lock);
+ return -ENOMEM;
+ }
+
+ rsp->mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
+ rsp->ext_feat = 0;
+
+ __a2mp_add_cl(mgr, rsp->cl, num_ctrl);
+
+ read_unlock(&hci_dev_list_lock);
+
+ a2mp_send(mgr, A2MP_DISCOVER_RSP, hdr->ident, len, rsp);
+
+ kfree(rsp);
+ return 0;
+}
+
/* Handle A2MP signalling */
static int a2mp_chan_recv_cb(void *data, struct sk_buff *skb)
{
@@ -109,6 +191,9 @@ static int a2mp_chan_recv_cb(void *data, struct sk_buff *skb)
break;
case A2MP_DISCOVER_REQ:
+ err = a2mp_discover_req(mgr, skb, hdr);
+ break;
+
case A2MP_CHANGE_NOTIFY:
case A2MP_GETINFO_REQ:
case A2MP_GETAMPASSOC_REQ:
--
1.7.9.5
next prev parent reply other threads:[~2012-05-18 14:25 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 14:25 [PATCHv1 00/17] Bluetooth A2MP implementation Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 01/17] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-05-22 17:45 ` Mat Martineau
2012-05-23 7:49 ` Andrei Emeltchenko
2012-05-23 15:44 ` Mat Martineau
2012-05-24 7:51 ` Andrei Emeltchenko
2012-05-24 15:59 ` Mat Martineau
2012-05-25 8:09 ` Andrei Emeltchenko
2012-05-25 17:18 ` Mat Martineau
2012-05-28 7:24 ` Andrei Emeltchenko
2012-05-28 13:59 ` Andrei Emeltchenko
2012-05-29 16:23 ` Mat Martineau
2012-05-30 13:29 ` Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 02/17] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 03/17] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 04/17] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 05/17] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 06/17] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 07/17] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 08/17] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-05-18 14:25 ` Andrei Emeltchenko [this message]
2012-05-18 14:25 ` [PATCHv1 10/17] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 11/17] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 12/17] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 13/17] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 14/17] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 15/17] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-05-18 14:25 ` [PATCHv1 16/17] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-05-21 22:28 ` Mat Martineau
2012-05-22 8:12 ` Andrei Emeltchenko
2012-05-22 17:35 ` Mat Martineau
2012-05-18 14:25 ` [PATCHv1 17/17] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-05-21 22:45 ` Mat Martineau
2012-05-22 7:37 ` Andrei Emeltchenko
2012-05-22 17:38 ` Mat Martineau
2012-05-18 20:57 ` [PATCHv1 00/17] Bluetooth A2MP implementation Gustavo Padovan
2012-05-23 15:37 ` [PATCHv2 00/19] " Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 01/19] Bluetooth: Add unlink to L2CAP channel ops Andrei Emeltchenko
2012-05-23 23:13 ` Mat Martineau
2012-05-23 15:37 ` [PATCHv2 02/19] Bluetooth: Add ready " Andrei Emeltchenko
2012-05-23 23:16 ` Mat Martineau
2012-05-24 7:59 ` Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 03/19] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 04/19] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 05/19] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 06/19] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 07/19] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 08/19] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 09/19] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 10/19] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 11/19] Bluetooth: A2MP: Process A2MP Discover Request Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 12/19] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 13/19] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 14/19] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 15/19] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 16/19] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 17/19] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 18/19] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-05-23 15:37 ` [PATCHv2 19/19] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-05-23 23:30 ` Mat Martineau
2012-05-24 11:43 ` Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 00/18] Bluetooth A2MP implementation Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 01/18] Bluetooth: Add ready to L2CAP channel ops Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 02/18] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 03/18] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 04/18] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 05/18] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-05-25 12:20 ` Gustavo Padovan
2012-05-25 13:08 ` Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 06/18] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 07/18] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 08/18] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 09/18] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 10/18] Bluetooth: A2MP: Process A2MP Discover Request Andrei Emeltchenko
2012-05-25 12:19 ` Gustavo Padovan
2012-05-25 13:11 ` Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 11/18] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-05-25 12:29 ` Gustavo Padovan
2012-05-24 11:38 ` [PATCHv3 12/18] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 13/18] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 14/18] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 15/18] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 16/18] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 17/18] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-05-24 11:38 ` [PATCHv3 18/18] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 00/17] Bluetooth A2MP implementation Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 01/17] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 02/17] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 03/17] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 04/17] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 05/17] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 06/17] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 07/17] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 08/17] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 09/17] Bluetooth: A2MP: Process A2MP Discover Request Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 10/17] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 11/17] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 12/17] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 13/17] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 14/17] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 15/17] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 16/17] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-05-29 10:59 ` [PATCHv4 17/17] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-05-29 15:52 ` Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337351150-20526-10-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).