Commit c4f912e1 authored by Marcel Holtmann's avatar Marcel Holtmann

Bluetooth: Add global deferred socket parameter

The L2CAP and RFCOMM applications require support for authorization
and the ability of rejecting incoming connection requests. The socket
interface is not really able to support this.

This patch does the ground work for a socket option to defer connection
setup. Setting this option allows calling of accept() and then the
first read() will trigger the final connection setup. Calling close()
would reject the connection.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d58daf42
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
#define SOL_SCO 17 #define SOL_SCO 17
#define SOL_RFCOMM 18 #define SOL_RFCOMM 18
#define BT_DEFER_SETUP 7
#define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg) #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg) #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
#define BT_DBG(fmt, arg...) pr_debug("%s: " fmt "\n" , __func__ , ## arg) #define BT_DBG(fmt, arg...) pr_debug("%s: " fmt "\n" , __func__ , ## arg)
...@@ -108,6 +110,7 @@ struct bt_sock { ...@@ -108,6 +110,7 @@ struct bt_sock {
bdaddr_t dst; bdaddr_t dst;
struct list_head accept_q; struct list_head accept_q;
struct sock *parent; struct sock *parent;
u32 defer_setup;
}; };
struct bt_sock_list { struct bt_sock_list {
......
...@@ -217,7 +217,8 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock) ...@@ -217,7 +217,8 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
continue; continue;
} }
if (sk->sk_state == BT_CONNECTED || !newsock) { if (sk->sk_state == BT_CONNECTED || !newsock ||
bt_sk(parent)->defer_setup) {
bt_accept_unlink(sk); bt_accept_unlink(sk);
if (newsock) if (newsock)
sock_graft(sk, newsock); sock_graft(sk, newsock);
...@@ -275,6 +276,9 @@ static inline unsigned int bt_accept_poll(struct sock *parent) ...@@ -275,6 +276,9 @@ static inline unsigned int bt_accept_poll(struct sock *parent)
struct list_head *p, *n; struct list_head *p, *n;
struct sock *sk; struct sock *sk;
if (bt_sk(parent)->defer_setup)
return POLLIN | POLLRDNORM;
list_for_each_safe(p, n, &bt_sk(parent)->accept_q) { list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
sk = (struct sock *) list_entry(p, struct bt_sock, accept_q); sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
if (sk->sk_state == BT_CONNECTED) if (sk->sk_state == BT_CONNECTED)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment