All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv7 09/23] Bluetooth: A2MP: Process A2MP Discover Request
Date: Fri, 20 Apr 2012 14:09:37 +0300	[thread overview]
Message-ID: <1334920191-29308-10-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1334920191-29308-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 2eb46ee..c9aa9c5 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 16ab35d..67e8eaa 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -644,6 +644,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 4f3e6f9..b4eb294 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 inline 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


  parent reply	other threads:[~2012-04-20 11:09 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-23 16:13 [RFCv5 00/26] RFC Bluetooth A2MP implementation Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 01/26] Bluetooth: Add set_err to state_change callback Andrei Emeltchenko
2012-03-25 16:48   ` Gustavo Padovan
2012-03-23 16:13 ` [RFCv5 02/26] Bluetooth: Lock sk only if exist in state_change Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 03/26] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-03-25 17:12   ` Gustavo Padovan
2012-03-26  9:27     ` Andrei Emeltchenko
2012-03-27 15:54       ` Gustavo Padovan
2012-03-23 16:13 ` [RFCv5 04/26] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 05/26] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 06/26] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-03-25 17:16   ` Gustavo Padovan
2012-03-26 11:59     ` Andrei Emeltchenko
2012-03-27 16:06       ` Gustavo Padovan
2012-03-23 16:13 ` [RFCv5 07/26] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 08/26] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 09/26] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 10/26] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 11/26] Bluetooth: A2MP: Helper functions to count HCI devs Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 12/26] Bluetooth: A2MP: Process A2MP Discover Request Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 13/26] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 14/26] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 15/26] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 16/26] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 17/26] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 18/26] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-03-23 16:13 ` [RFCv5 19/26] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 20/26] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 21/26] Bluetooth: physical link HCI interface to AMP Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 22/26] Bluetooth: Define AMP controller statuses Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 23/26] Bluetooth: General HCI callback implementation Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 24/26] Bluetooth: Process HCI callbacks in a workqueue Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 25/26] Bluetooth: AMP: Use HCI callback for Read AMP Info Andrei Emeltchenko
2012-03-23 16:14 ` [RFCv5 26/26] Bluetooth: AMP: Read Local Assoc support Andrei Emeltchenko
2012-03-28 13:31   ` [RFCv6 00/26] RFC Bluetooth A2MP implementation Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 01/26] Bluetooth: Add Read Local AMP Info to init Andrei Emeltchenko
2012-04-06 22:38       ` Gustavo Padovan
2012-03-28 13:31     ` [RFCv6 02/26] Bluetooth: Adds set_default function in L2CAP setup Andrei Emeltchenko
2012-04-06 22:39       ` Gustavo Padovan
2012-03-28 13:31     ` [RFCv6 03/26] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 04/26] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 05/26] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-04-06 22:44       ` Gustavo Padovan
2012-04-11 13:33         ` Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 06/26] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-04-06 23:20       ` Gustavo Padovan
2012-04-12  8:00         ` Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 07/26] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 08/26] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 09/26] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 10/26] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-04-06 23:23       ` Gustavo Padovan
2012-04-12  8:06         ` Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 11/26] Bluetooth: A2MP: Helper functions to count HCI devs Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 12/26] Bluetooth: A2MP: Process A2MP Discover Request Andrei Emeltchenko
2012-04-06 23:55       ` Gustavo Padovan
2012-03-28 13:31     ` [RFCv6 13/26] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 14/26] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 15/26] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 16/26] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 17/26] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 18/26] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 19/26] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 20/26] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 21/26] Bluetooth: physical link HCI interface to AMP Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 22/26] Bluetooth: Define AMP controller statuses Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 23/26] Bluetooth: General HCI callback implementation Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 24/26] Bluetooth: Process HCI callbacks in a workqueue Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 25/26] Bluetooth: AMP: Use HCI callback for Read AMP Info Andrei Emeltchenko
2012-03-28 13:31     ` [RFCv6 26/26] Bluetooth: AMP: Read Local Assoc support Andrei Emeltchenko
2012-04-20 11:09   ` [RFCv7 00/23] RFC Bluetooth A2MP implementation Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 01/23] Bluetooth: A2MP: Create A2MP channel Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 02/23] Bluetooth: A2MP: AMP Manager basic functions Andrei Emeltchenko
2012-04-20 14:51       ` Ulisses Furquim
2012-04-23  7:22         ` Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 03/23] Bluetooth: A2MP: Build and Send msg helpers Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 04/23] Bluetooth: A2MP: Add chan callbacks Andrei Emeltchenko
2012-04-20 14:09       ` Ulisses Furquim
2012-04-23  7:26         ` Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 05/23] Bluetooth: A2MP: Definitions for A2MP commands Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 06/23] Bluetooth: A2MP: Define A2MP status codes Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 07/23] Bluetooth: A2MP: Process A2MP messages Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 08/23] Bluetooth: A2MP: Process A2MP Command Reject Andrei Emeltchenko
2012-04-20 11:09     ` Andrei Emeltchenko [this message]
2012-04-20 11:09     ` [RFCv7 10/23] Bluetooth: A2MP: Process A2MP Change Notify Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 11/23] Bluetooth: A2MP: Process A2MP Get Info Request Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 12/23] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 13/23] Bluetooth: A2MP: Process A2MP Create Physlink Request Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 14/23] Bluetooth: A2MP: Process A2MP Disc " Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 15/23] Bluetooth: A2MP: Process A2MP Command Responses Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 16/23] Bluetooth: A2MP: Handling fixed channels Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 17/23] Bluetooth: A2MP: Manage incoming connections Andrei Emeltchenko
2012-04-25 19:58       ` Gustavo Padovan
2012-04-26  8:29         ` Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 18/23] Bluetooth: physical link HCI interface to AMP Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 19/23] Bluetooth: Define AMP controller statuses Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 20/23] Bluetooth: General HCI callback implementation Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 21/23] Bluetooth: Process HCI callbacks in a workqueue Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 22/23] Bluetooth: AMP: Use HCI callback for Read AMP Info Andrei Emeltchenko
2012-04-20 11:09     ` [RFCv7 23/23] Bluetooth: AMP: Read Local Assoc support Andrei Emeltchenko

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=1334920191-29308-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.