Hi Gustavo,
On 14:10 Tue 07 Dec, Gustavo F. Padovan wrote:
> Hi Vinicius,
>
> * Vinicius Costa Gomes <vinicius.gomes@xxxxxxxxxxxxx> [2010-12-06 18:43:45 -0300]:
>
> > These simple commands will allow the SMP procedure to be started
> > and terminated with a not supported error. This is the first step
> > toward something useful.
> >
> > Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@xxxxxxxxxxxxx>
> > Signed-off-by: Anderson Briglia <anderson.briglia@xxxxxxxxxxxxx>
> > ---
> > include/net/bluetooth/smp.h | 4 +
> > net/bluetooth/Makefile | 1 +
> > net/bluetooth/{l2cap.c => l2cap_core.c} | 0
> > net/bluetooth/smp.c | 144 +++++++++++++++++++++++++++++++
> > 4 files changed, 149 insertions(+), 0 deletions(-)
> > rename net/bluetooth/{l2cap.c => l2cap_core.c} (100%)
> > create mode 100644 net/bluetooth/smp.c
> >
> > diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
> > index 8f2edbf..b9603cc 100644
> > --- a/include/net/bluetooth/smp.h
> > +++ b/include/net/bluetooth/smp.h
> > @@ -73,4 +73,8 @@ struct smp_cmd_security_req {
> > #define SMP_UNSPECIFIED 0x08
> > #define SMP_REPEATED_ATTEMPTS 0x09
> >
> > +/* SMP Commands */
> > +int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level);
> > +int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);
> > +
> > #endif /* __SMP_H */
> > diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
> > index d1e433f..d138b23 100644
> > --- a/net/bluetooth/Makefile
> > +++ b/net/bluetooth/Makefile
> > @@ -11,3 +11,4 @@ obj-$(CONFIG_BT_CMTP) += cmtp/
> > obj-$(CONFIG_BT_HIDP) += hidp/
> >
> > bluetooth-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o
> > +l2cap-objs := l2cap_core.o smp.o
> > diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap_core.c
> > similarity index 100%
> > rename from net/bluetooth/l2cap.c
> > rename to net/bluetooth/l2cap_core.c
> > diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
> > new file mode 100644
> > index 0000000..e427d11
> > --- /dev/null
> > +++ b/net/bluetooth/smp.c
> > @@ -0,0 +1,144 @@
> > +/*
> > + BlueZ - Bluetooth protocol stack for Linux
> > + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
> > +
> > + This program is free software; you can redistribute it and/or modify
> > + it under the terms of the GNU General Public License version 2 as
> > + published by the Free Software Foundation;
> > +
> > + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
> > + IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
> > + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
> > + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> > + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> > + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> > +
> > + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
> > + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
> > + SOFTWARE IS DISCLAIMED.
> > +*/
> > +
> > +#include <net/bluetooth/bluetooth.h>
> > +#include <net/bluetooth/hci_core.h>
> > +#include <net/bluetooth/l2cap.h>
> > +#include <net/bluetooth/smp.h>
> > +
> > +static struct sk_buff *smp_build_cmd(struct l2cap_conn *conn, u8 code,
> > + u16 dlen, void *data)
> > +{
> > + struct sk_buff *skb;
> > + struct l2cap_hdr *lh;
> > + int len;
> > +
> > + len = L2CAP_HDR_SIZE + 1 + dlen;
> > +
> > + if (len > conn->mtu)
> > + return NULL;
> > +
> > + skb = bt_skb_alloc(len, GFP_ATOMIC);
> > + if (!skb)
> > + return NULL;
> > +
> > + lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
> > + lh->len = cpu_to_le16(1 + dlen);
> > + lh->cid = cpu_to_le16(L2CAP_CID_SMP);
> > +
> > + memcpy(skb_put(skb, 1), &code, 1);
> > +
> > + memcpy(skb_put(skb, dlen), data, dlen);
> > +
> > + return skb;
> > +}
> > +
> > +static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
> > +{
> > + struct sk_buff *skb = smp_build_cmd(conn, code, len, data);
> > +
> > + BT_DBG("code 0x%2.2x", code);
> > +
> > + if (!skb)
> > + return;
> > +
> > + hci_send_acl(conn->hcon, skb, 0);
> > +}
> > +
> > +int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
> > +{
> > + __u8 authreq;
> > +
> > + BT_DBG("conn %p hcon %p level 0x%2.2x", conn, conn->hcon, sec_level);
> > +
> > + switch (sec_level) {
> > + case BT_SECURITY_MEDIUM:
> > + /* Encrypted, no MITM protection */
> > + authreq = 0x01;
> > + break;
> > +
> > + case BT_SECURITY_HIGH:
> > + /* Bonding, MITM protection */
> > + authreq = 0x05;
>
> It would be good have some defines for the authreq values.
Makes sense.
>
> --
> Gustavo F. Padovan
> http://profusion.mobi
Cheers,
--
Vinicius
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
