Initial Management patches (rebased again)
Subsystems (2)
Hi,
Same patches rebased against latest bluetooth-next-2.6. The coding style issues with sizeof() usage (brought up by Lizardo) have also been fixed.
Johan
PATCH 1/3 Bluetooth: Add Bluetooth Management interface definitions
From: Johan Hedberg <[email protected]>
Add initial definitions for the new Bluetooth Management interface to the bluetooth headers.
--- include/net/bluetooth/hci.h | 4 +++ include/net/bluetooth/hci_core.h | 1 + include/net/bluetooth/mgmt.h | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 include/net/bluetooth/mgmt.h
include/net/bluetooth/hci.h +4 -0
@@ -934,9 +934,13 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)struct sockaddr_hci {sa_family_t hci_family;unsigned short hci_dev; +unsigned short hci_channel; };#define HCI_DEV_NONE 0xffff +#define HCI_CHANNEL_RAW 0 +#define HCI_CHANNEL_CONTROL 1 +struct hci_filter {unsigned long type_mask;unsigned long event_mask[2 ];
include/net/bluetooth/hci_core.h +1 -0
@@ -668,6 +668,7 @@ struct hci_pinfo {struct hci_dev *hdev;struct hci_filter filter;__u32 cmsg_mask; +unsigned short channel; };/* HCI security filter */
include/net/bluetooth/mgmt.h new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 2/3 Bluetooth: Add initial Bluetooth Management interface callbacks
In reply to [email protected]From: Johan Hedberg <[email protected]>
Add initial code for handling Bluetooth Management interface messages.
--- include/net/bluetooth/hci_core.h | 3 + net/bluetooth/Makefile | 2 +- net/bluetooth/hci_sock.c | 39 +++++++++++++-- net/bluetooth/mgmt.c | 99 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 net/bluetooth/mgmt.c
include/net/bluetooth/hci_core.h +3 -0
@@ -660,6 +660,9 @@ void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);/* ----- HCI Sockets ----- */ void hci_send_to_sock (struct hci_dev *hdev,struct sk_buff *skb); +/* Management interface */ +int mgmt_control (struct sock *sk,struct msghdr *msg,size_t len); +/* HCI info for socket */ #define hci_pi (sk) ((struct hci_pinfo *) sk)
net/bluetooth/Makefile +1 -1
@@ -10,4 +10,4 @@ obj-$(CONFIG_BT_BNEP) += bnep/ obj-$(CONFIG_BT_CMTP) += cmtp/ obj-$(CONFIG_BT_HIDP) += hidp/ -bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o +bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o
net/bluetooth/hci_sock.c +33 -6
@@ -49,6 +49,8 @@#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> +static int enable_mgmt; +/* ----- HCI socket interface ----- */ static inline int hci_test_bit (int nr,void *addr)
@@ -353,25 +355,35 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long astatic int hci_sock_bind (struct socket *sock,struct sockaddr *addr,int addr_len) { -struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr; +struct sockaddr_hci haddr;struct sock *sk = sock->sk;struct hci_dev *hdev =NULL ; -int err =0 ; +int len, err =0 ;BT_DBG ("sock %p sk %p" , sock, sk); -if (!haddr || haddr->hci_family !=AF_BLUETOOTH ) +if (!addr) +return -EINVAL ; + +memset (&haddr,0 ,sizeof (haddr)); + len = min_t(unsigned int, sizeof(haddr), addr_len); +memcpy (&haddr, addr, len); + +if (haddr.hci_family !=AF_BLUETOOTH ) +return -EINVAL ; + +if (haddr.hci_channel !=HCI_CHANNEL_RAW && !enable_mgmt)return -EINVAL ;lock_sock (sk); -if (hci_pi (sk)->hdev) { +if (sk->sk_state ==BT_BOUND ||hci_pi (sk)->hdev) { err = -EALREADY ; goto done; } -if (haddr->hci_dev !=HCI_DEV_NONE ) { - hdev =hci_dev_get (haddr->hci_dev); +if (haddr.hci_dev !=HCI_DEV_NONE ) { + hdev =hci_dev_get (haddr.hci_dev);if (!hdev) { err = -ENODEV ; goto done;
@@ -380,6 +392,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_leatomic_inc (&hdev->promisc); } +hci_pi (sk)->channel = haddr.hci_channel;hci_pi (sk)->hdev = hdev; sk->sk_state =BT_BOUND ;
@@ -502,6 +515,17 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,lock_sock (sk); +switch (hci_pi (sk)->channel) { +case HCI_CHANNEL_RAW : +break ; +case HCI_CHANNEL_CONTROL : + err =mgmt_control (sk, msg, len); + goto done; +default : + err = -EINVAL ; + goto done; + } + hdev =hci_pi (sk)->hdev;if (!hdev) { err = -EBADFD ;
@@ -831,3 +855,6 @@ void __exit hci_sock_cleanup(void)proto_unregister (&hci_sk_proto); } + +module_param (enable_mgmt, bool,0644 ); +MODULE_PARM_DESC (enable_mgmt,"Enable Management interface" );
net/bluetooth/mgmt.c new file +99 -0
99 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 3/3 Bluetooth: Make hci_send_to_sock usable for management control sockets
In reply to [email protected]From: Johan Hedberg <[email protected]>
In order to send data to management control sockets the function should:
- skip checks intended for raw HCI data and stack internal events
- make sure RAW HCI data or stack internal events don't go to management control sockets
In order to accomplish this the patch adds a new member to the bluetooth skb private data to flag skb's that are destined for management control sockets.
--- include/net/bluetooth/bluetooth.h | 1 + net/bluetooth/hci_sock.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
@@ -144,6 +144,7 @@ struct bt_skb_cb {__u8 tx_seq;__u8 retries;__u8 sar; +unsigned short channel; };#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))
net/bluetooth/hci_sock.c +9 -1
@@ -104,6 +104,12 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)if (skb->sk == sk)continue ; +if (bt_cb (skb)->channel !=hci_pi (sk)->channel) +continue ; + +if (bt_cb (skb)->channel ==HCI_CHANNEL_CONTROL ) + goto clone; +/* Apply filter */ flt = &hci_pi (sk)->filter;
@@ -127,12 +133,14 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)continue ; } +clone: nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb)continue ;/* Put type byte before the data */ -memcpy (skb_push (nskb,1 ), &bt_cb (nskb)->pkt_type,1 ); +if (bt_cb (skb)->channel ==HCI_CHANNEL_RAW ) +memcpy (skb_push (nskb,1 ), &bt_cb (nskb)->pkt_type,1 );if (sock_queue_rcv_skb (sk, nskb))kfree_skb (nskb);
Signature · 1 line
1.7.2.3
Re: [PATCH 3/3] Bluetooth: Make hci_send_to_sock usable for management control sockets
Hi Johan,
Quoted 8 lines · * [email protected] <[email protected]> [2010-12-08 00:21:07 +0200]:
From: Johan Hedberg <[email protected]>
In order to send data to management control sockets the function should:
- skip checks intended for raw HCI data and stack internal events
- make sure RAW HCI data or stack internal events don't go to management control sockets
Quoted 6 lines
In order to accomplish this the patch adds a new member to the bluetooth skb private data to flag skb's that are destined for management control sockets.
Signed-off-by Johan Hedberg <[email protected]>Acked-by Marcel Holtmann <[email protected]>
All 3 patches have been applied. Thanks.
Signature · 2 lines
Gustavo F. Padovan http://profusion.mobi