From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv0 12/20] Bluetooth: A2MP: process A2MP Discover Request
Date: Wed, 2 Nov 2011 16:02:40 +0200 [thread overview]
Message-ID: <1320242568-372-13-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1320242568-372-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/a2mp.h | 6 +++++
net/bluetooth/a2mp.c | 51 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/include/net/bluetooth/a2mp.h b/include/net/bluetooth/a2mp.h
index e2eec2b..1782f47 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 *get_amp_mgr_sk(struct sock *sk);
struct amp_mgr *create_amp_mgr(struct l2cap_conn *conn);
void remove_amp_mgr(struct amp_mgr *mgr);
@@ -105,6 +107,10 @@ struct a2mp_physlink_rsp {
__u8 status;
} __packed;
+enum {
+ FLAG_DISCOVERED,
+};
+
struct a2mp_work_data_ready {
struct work_struct work;
struct sock *sk;
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index e10924e..b67696f 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -114,6 +114,54 @@ static inline 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;
+ struct a2mp_discov_rsp *rsp;
+ u16 ext_feat;
+ size_t len;
+ u8 num_ctrl;
+
+ if (skb->len < sizeof(*req))
+ return -EINVAL;
+
+ skb_pull(skb, sizeof(*req));
+
+ BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(req->mtu),
+ le16_to_cpu(req->ext_feat));
+
+ ext_feat = le16_to_cpu(req->ext_feat);
+
+ /* check that packet is not broken for now */
+ while (ext_feat & A2MP_FEAT_EXT) {
+ if (skb->len < sizeof(ext_feat))
+ return -EINVAL;
+
+ ext_feat = get_unaligned_le16(skb->data);
+ BT_DBG("ext_feat 0x%4.4x", le16_to_cpu(req->ext_feat));
+ skb_pull(skb, sizeof(ext_feat));
+ }
+
+ num_ctrl = hci_num_ctrl();
+ len = num_ctrl * sizeof(struct a2mp_cl) + sizeof (*rsp);
+ rsp = kmalloc(len, GFP_KERNEL);
+ if (!rsp)
+ return -ENOMEM;
+
+ rsp->mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
+ rsp->ext_feat = 0;
+
+ __a2mp_add_cl(rsp->cl, num_ctrl);
+
+ BT_DBG("num_ctrl = %d", num_ctrl);
+
+ a2mp_send(mgr->a2mp_sock, A2MP_DISCOVER_RSP, hdr->ident, len, rsp);
+
+ kfree(rsp);
+ return 0;
+}
+
/* Handle A2MP signalling */
void a2mp_receive(struct sock *sk, struct sk_buff *skb)
{
@@ -144,6 +192,9 @@ void a2mp_receive(struct sock *sk, 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.4.1
next prev parent reply other threads:[~2011-11-02 14:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-02 14:02 [RFCv0 00/20] RFC A2MP implementation Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 01/20] Bluetooth: A2MP: create A2MP socket Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 02/20] Bluetooth: A2MP: sk_data_ready for a2mp socket Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 03/20] Bluetooth: A2MP: sk_state_change " Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 04/20] Bluetooth: A2MP: build and send msg helpers Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 05/20] Bluetooth: A2MP: AMP Manager basic functions Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 06/20] Bluetooth: A2MP: Remove AMP manager in state_change Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 07/20] Bluetooth: A2MP: AMP manager initialization Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 08/20] Bluetooth: A2MP: Definitions for A2MP commands Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 09/20] Bluetooth: A2MP: process A2MP messages Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 10/20] Bluetooth: A2MP: processing A2MP command reject Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 11/20] Bluetooth: A2MP: helper functions to count HCI devs Emeltchenko Andrei
2011-11-02 14:02 ` Emeltchenko Andrei [this message]
2011-11-02 14:02 ` [RFCv0 13/20] Bluetooth: A2MP: process A2MP Change Notify Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 14/20] Bluetooth: A2MP: process A2MP Get Info Request Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 15/20] Bluetooth: A2MP: process A2MP Get AMP Assoc Request Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 16/20] Bluetooth: A2MP: process A2MP Create Physlink Request Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 17/20] Bluetooth: A2MP: process A2MP Disc " Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 18/20] Bluetooth: A2MP: process A2MP Command Responses Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 19/20] Bluetooth: A2MP: handling fixed channel Emeltchenko Andrei
2011-11-02 14:02 ` [RFCv0 20/20] Bluetooth: A2MP: manage incoming connection Emeltchenko Andrei
2011-11-04 0:20 ` [RFCv0 00/20] RFC A2MP implementation Peter Krystad
2011-11-04 7:47 ` 'Emeltchenko Andrei'
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=1320242568-372-13-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