Re: [bluetooth-next 10/15] Bluetooth: Add support for resuming socket when SMP is finished

["Gustavo F. Padovan" <padovan@profusion.mobi>]

Hi Vinicius,

* Vinicius Costa Gomes <vinicius.gomes@openbossa.org> [2011-04-05 22:51:51 -0300]:

> This adds support for resuming the user space traffic when SMP
> negotiation is complete.
> 
> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
> ---
>  net/bluetooth/l2cap_core.c |   61 ++++++++++++++++++++++---------------------
>  net/bluetooth/l2cap_sock.c |   16 +++++++++++
>  net/bluetooth/smp.c        |   40 ++++++++++++++++++++--------
>  3 files changed, 75 insertions(+), 42 deletions(-)
> 
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 0cec292..a5062f14 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -665,6 +665,22 @@ clean:
>  	bh_unlock_sock(parent);
>  }
>  
> +static void l2cap_chan_ready(struct sock *sk)
> +{
> +	struct sock *parent = bt_sk(sk)->parent;
> +
> +	BT_DBG("sk %p, parent %p", sk, parent);
> +
> +	l2cap_pi(sk)->conf_state = 0;
> +	l2cap_sock_clear_timer(sk);
> +
> +	sk->sk_state = BT_CONNECTED;
> +	sk->sk_state_change(sk);
> +
> +	if (parent)
> +		parent->sk_data_ready(parent, 0);
> +}
> +
>  static void l2cap_conn_ready(struct l2cap_conn *conn)
>  {
>  	struct l2cap_chan_list *l = &conn->chan_list;
> @@ -680,15 +696,11 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
>  	for (sk = l->head; sk; sk = l2cap_pi(sk)->next_c) {
>  		bh_lock_sock(sk);
>  
> -		if (conn->hcon->type == LE_LINK) {
> -			l2cap_sock_clear_timer(sk);
> -			sk->sk_state = BT_CONNECTED;
> -			sk->sk_state_change(sk);
> +		if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA) {
>  			if (smp_conn_security(conn, l2cap_pi(sk)->sec_level))
> -				BT_DBG("Insufficient security");
> -		}
> +				l2cap_chan_ready(sk);
>  
> -		if (sk->sk_type != SOCK_SEQPACKET &&
> +		} else if (sk->sk_type != SOCK_SEQPACKET &&
>  				sk->sk_type != SOCK_STREAM) {
>  			l2cap_sock_clear_timer(sk);
>  			sk->sk_state = BT_CONNECTED;
> @@ -1362,29 +1374,6 @@ int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len)
>  	return size;
>  }
>  
> -static void l2cap_chan_ready(struct sock *sk)
> -{
> -	struct sock *parent = bt_sk(sk)->parent;
> -
> -	BT_DBG("sk %p, parent %p", sk, parent);
> -
> -	l2cap_pi(sk)->conf_state = 0;
> -	l2cap_sock_clear_timer(sk);
> -
> -	if (!parent) {
> -		/* Outgoing channel.
> -		 * Wake up socket sleeping on connect.
> -		 */
> -		sk->sk_state = BT_CONNECTED;
> -		sk->sk_state_change(sk);
> -	} else {
> -		/* Incoming channel.
> -		 * Wake up socket sleeping on accept.
> -		 */
> -		parent->sk_data_ready(parent, 0);
> -	}
> -}
> -
>  /* Copy frame to all raw sockets on that connection */
>  static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
>  {
> @@ -3810,6 +3799,18 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
>  	for (sk = l->head; sk; sk = l2cap_pi(sk)->next_c) {
>  		bh_lock_sock(sk);
>  
> +		BT_DBG("sk->scid %d", l2cap_pi(sk)->scid);
> +
> +		if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA) {
> +			if (!status && encrypt) {
> +				l2cap_pi(sk)->sec_level = hcon->sec_level;
> +				l2cap_chan_ready(sk);
> +			}
> +
> +			bh_unlock_sock(sk);
> +			continue;
> +		}
> +
>  		if (l2cap_pi(sk)->conf_state & L2CAP_CONF_CONNECT_PEND) {
>  			bh_unlock_sock(sk);
>  			continue;
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index f77308e..14e491a 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -29,6 +29,7 @@
>  #include <net/bluetooth/bluetooth.h>
>  #include <net/bluetooth/hci_core.h>
>  #include <net/bluetooth/l2cap.h>
> +#include <net/bluetooth/smp.h>
>  
>  /* ---- L2CAP timers ---- */
>  static void l2cap_sock_timeout(unsigned long arg)
> @@ -614,6 +615,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
>  {
>  	struct sock *sk = sock->sk;
>  	struct bt_security sec;
> +	struct l2cap_conn *conn;
>  	int len, err = 0;
>  	u32 opt;
>  
> @@ -650,6 +652,20 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
>  		}
>  
>  		l2cap_pi(sk)->sec_level = sec.level;
> +
> +		conn = l2cap_pi(sk)->conn;
> +		if (conn && l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA) {
> +			if (!conn->hcon->out) {
> +				err = -EINVAL;
> +				break;
> +			}
> +
> +			if (smp_conn_security(conn, sec.level))
> +				break;
> +
> +			err = 0;
> +			sk->sk_state = BT_CONFIG;
> +		}

I don't like the idea of bring SMP stuff to l2cap_sock.c, we are working now
to clean up that file and keep only socket related stuff there, and only
channel related stuff in l2cap_core.c. I've already sent a patchset on that
direction to mailing list. However, I don't have any idea now on how to remove
smp_conn_security() from here.

-- 
Gustavo F. Padovan
http://profusion.mobi