From patchwork Thu Nov 17 09:29:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Vilas RAMDASI X-Patchwork-Id: 126163 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C597DB7205 for ; Thu, 17 Nov 2011 20:29:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756201Ab1KQJ3V (ORCPT ); Thu, 17 Nov 2011 04:29:21 -0500 Received: from eu1sys200aog105.obsmtp.com ([207.126.144.119]:51740 "EHLO eu1sys200aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754693Ab1KQJ3O (ORCPT ); Thu, 17 Nov 2011 04:29:14 -0500 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKTsTT5ZUy+7jiDjTAzMtOIp+gy3Cq16oS@postini.com; Thu, 17 Nov 2011 09:29:13 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 88F96F9; Thu, 17 Nov 2011 09:20:38 +0000 (GMT) Received: from maildl1.amk.st.com (maildl1.amk.st.com [10.80.160.84]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 0E889C75; Thu, 17 Nov 2011 09:29:06 +0000 (GMT) Received: from amgdlh.dlh.st.com (amgdlh.dlh.st.com [10.199.8.26]) by maildl1.amk.st.com (MOS 3.10.10a-GA) with ESMTP id AHW58234; Thu, 17 Nov 2011 17:28:51 +0800 (SGT) Received: from bngl066.bnr.st.com (bngl066.bnr.st.com [10.41.2.76]) by amgdlh.dlh.st.com (STMicroelectronics) with ESMTP id 490AE156383; Thu, 17 Nov 2011 09:29:04 +0000 (GMT) Received: from bnru02.bnr.st.com (bnru02.bnr.st.com [10.201.54.39]) by bngl066.bnr.st.com (8.13.8/8.13.8) with ESMTP id pAH9T37C030093; Thu, 17 Nov 2011 14:59:03 +0530 Received: from bnru02.bnr.st.com (localhost [127.0.0.1]) by bnru02.bnr.st.com (8.14.3/8.14.3/Debian-9.1ubuntu1) with ESMTP id pAH9T3lv010505; Thu, 17 Nov 2011 14:59:03 +0530 Received: (from hemantv@localhost) by bnru02.bnr.st.com (8.14.3/8.14.3/Submit) id pAH9T3tm010490; Thu, 17 Nov 2011 14:59:03 +0530 From: Hemant Vilas RAMDASI To: netdev-owner@vger.kernel.org Cc: netdev@vger.kernel.org, remi.denis-courmont@nokia.com, Dinesh Kumar Sharma , Hemant Ramdasi Subject: [PATCH v7] Phonet: set the pipe handle using setsockopt Date: Thu, 17 Nov 2011 14:59:00 +0530 Message-Id: <1321522140-10133-1-git-send-email-hemant.ramdasi@stericsson.com> X-Mailer: git-send-email 1.7.4.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dinesh Kumar Sharma This provides flexibility to set the pipe handle using setsockopt. The pipe can be enabled (if disabled) later using ioctl. Signed-off-by: Hemant Ramdasi Signed-off-by: Dinesh Kumar Sharma --- include/linux/phonet.h | 2 + net/phonet/pep.c | 96 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/include/linux/phonet.h b/include/linux/phonet.h index 6fb1384..1847ef9 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h @@ -37,6 +37,7 @@ #define PNPIPE_ENCAP 1 #define PNPIPE_IFINDEX 2 #define PNPIPE_HANDLE 3 +#define PNPIPE_INITSTATE 4 #define PNADDR_ANY 0 #define PNADDR_BROADCAST 0xFC @@ -48,6 +49,7 @@ /* ioctls */ #define SIOCPNGETOBJECT (SIOCPROTOPRIVATE + 0) +#define SIOCPNENABLEPIPE (SIOCPROTOPRIVATE + 13) #define SIOCPNADDRESOURCE (SIOCPROTOPRIVATE + 14) #define SIOCPNDELRESOURCE (SIOCPROTOPRIVATE + 15) diff --git a/net/phonet/pep.c b/net/phonet/pep.c index f17fd84..7acd262 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -533,6 +533,29 @@ static int pep_connresp_rcv(struct sock *sk, struct sk_buff *skb) return pipe_handler_send_created_ind(sk); } +static int pep_enableresp_rcv(struct sock *sk, struct sk_buff *skb) +{ + struct pnpipehdr *hdr = pnp_hdr(skb); + + if (hdr->error_code != PN_PIPE_NO_ERROR) + return -ECONNREFUSED; + + return pep_indicate(sk, PNS_PIPE_ENABLED_IND, 0 /* sub-blocks */, + NULL, 0, GFP_ATOMIC); + +} + +static void pipe_start_flow_control(struct sock *sk) +{ + struct pep_sock *pn = pep_sk(sk); + + if (!pn_flow_safe(pn->tx_fc)) { + atomic_set(&pn->tx_credits, 1); + sk->sk_write_space(sk); + } + pipe_grant_credits(sk, GFP_ATOMIC); +} + /* Queue an skb to an actively connected sock. * Socket lock must be held. */ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb) @@ -578,13 +601,25 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb) sk->sk_state = TCP_CLOSE_WAIT; break; } + if (pn->init_enable == PN_PIPE_DISABLE) + sk->sk_state = TCP_SYN_RECV; + else { + sk->sk_state = TCP_ESTABLISHED; + pipe_start_flow_control(sk); + } + break; - sk->sk_state = TCP_ESTABLISHED; - if (!pn_flow_safe(pn->tx_fc)) { - atomic_set(&pn->tx_credits, 1); - sk->sk_write_space(sk); + case PNS_PEP_ENABLE_RESP: + if (sk->sk_state != TCP_SYN_SENT) + break; + + if (pep_enableresp_rcv(sk, skb)) { + sk->sk_state = TCP_CLOSE_WAIT; + break; } - pipe_grant_credits(sk, GFP_ATOMIC); + + sk->sk_state = TCP_ESTABLISHED; + pipe_start_flow_control(sk); break; case PNS_PEP_DISCONNECT_RESP: @@ -863,14 +898,32 @@ static int pep_sock_connect(struct sock *sk, struct sockaddr *addr, int len) int err; u8 data[4] = { 0 /* sub-blocks */, PAD, PAD, PAD }; - pn->pipe_handle = 1; /* anything but INVALID_HANDLE */ + if (pn->pipe_handle == PN_PIPE_INVALID_HANDLE) + pn->pipe_handle = 1; /* anything but INVALID_HANDLE */ + err = pipe_handler_request(sk, PNS_PEP_CONNECT_REQ, - PN_PIPE_ENABLE, data, 4); + pn->init_enable, data, 4); if (err) { pn->pipe_handle = PN_PIPE_INVALID_HANDLE; return err; } + sk->sk_state = TCP_SYN_SENT; + + return 0; +} + +static int pep_sock_enable(struct sock *sk, struct sockaddr *addr, int len) +{ + int err; + + err = pipe_handler_request(sk, PNS_PEP_ENABLE_REQ, PAD, + NULL, 0); + if (err) + return err; + + sk->sk_state = TCP_SYN_SENT; + return 0; } @@ -894,6 +947,19 @@ static int pep_ioctl(struct sock *sk, int cmd, unsigned long arg) answ = 0; release_sock(sk); return put_user(answ, (int __user *)arg); + break; + + case SIOCPNENABLEPIPE: + lock_sock(sk); + if (sk->sk_state == TCP_SYN_SENT) + answ = -EBUSY; + else if (sk->sk_state == TCP_ESTABLISHED) + answ = -EISCONN; + else + answ = pep_sock_enable(sk, NULL, 0); + release_sock(sk); + return answ; + break; } return -ENOIOCTLCMD; @@ -959,6 +1025,18 @@ static int pep_setsockopt(struct sock *sk, int level, int optname, } goto out_norel; + case PNPIPE_HANDLE: + if ((sk->sk_state == TCP_CLOSE) && + (val >= 0) && (val < PN_PIPE_INVALID_HANDLE)) + pn->pipe_handle = val; + else + err = -EINVAL; + break; + + case PNPIPE_INITSTATE: + pn->init_enable = !!val; + break; + default: err = -ENOPROTOOPT; } @@ -994,6 +1072,10 @@ static int pep_getsockopt(struct sock *sk, int level, int optname, return -EINVAL; break; + case PNPIPE_INITSTATE: + val = pn->init_enable; + break; + default: return -ENOPROTOOPT; }