All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Diego Elio Pettenò" <flameeyes@gmail.com>
To: netdev@vger.kernel.org, linux-sctp@vger.kernel.org
Cc: "Diego Elio 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Subject: [PATCH] sctp: implement SIOCINQ ioctl() (take 3)
Date: Wed, 29 Sep 2010 01:51:35 +0000	[thread overview]
Message-ID: <1285725095-9860-1-git-send-email-flameeyes@gmail.com> (raw)
In-Reply-To: <1277389013-14765-1-git-send-email-flameeyes@gmail.com>

From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>

This simple patch copies the current approach for SIOCINQ ioctl() from DCCP
into SCTP so that the userland code working with SCTP can use a similar
interface across different protocols to know how much space to allocate for
a buffer.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index ca44917..199ec05 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3595,7 +3595,40 @@ out:
 /* The SCTP ioctl handler. */
 SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
-	return -ENOIOCTLCMD;
+	int rc = -ENOTCONN;
+
+	sctp_lock_sock(sk);
+
+	/*
+	 * SEQPACKET-style sockets in LISTENING state are valid, for
+	 * SCTP, so only discard TCP-style sockets in LISTENING state.
+	 */
+	if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
+		goto out;
+
+	switch (cmd) {
+	case SIOCINQ: {
+		struct sk_buff *skb;
+		unsigned int amount = 0;
+
+		skb = skb_peek(&sk->sk_receive_queue);
+		if (skb != NULL) {
+			/*
+			 * We will only return the amount of this packet since
+			 * that is all that will be read.
+			 */
+			amount = skb->len;
+		}
+		rc = put_user(amount, (int __user *)arg);
+	}
+		break;
+	default:
+		rc = -ENOIOCTLCMD;
+		break;
+	}
+out:
+	sctp_release_sock(sk);
+	return rc;
 }
 
 /* This is the function which gets called during socket creation to
-- 
1.7.3


WARNING: multiple messages have this Message-ID (diff)
From: "Diego Elio Pettenò" <flameeyes@gmail.com>
To: netdev@vger.kernel.org, linux-sctp@vger.kernel.org
Cc: "Diego Elio 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Subject: [PATCH] sctp: implement SIOCINQ ioctl() (take 3)
Date: Wed, 29 Sep 2010 03:51:35 +0200	[thread overview]
Message-ID: <1285725095-9860-1-git-send-email-flameeyes@gmail.com> (raw)

From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>

This simple patch copies the current approach for SIOCINQ ioctl() from DCCP
into SCTP so that the userland code working with SCTP can use a similar
interface across different protocols to know how much space to allocate for
a buffer.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index ca44917..199ec05 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3595,7 +3595,40 @@ out:
 /* The SCTP ioctl handler. */
 SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
-	return -ENOIOCTLCMD;
+	int rc = -ENOTCONN;
+
+	sctp_lock_sock(sk);
+
+	/*
+	 * SEQPACKET-style sockets in LISTENING state are valid, for
+	 * SCTP, so only discard TCP-style sockets in LISTENING state.
+	 */
+	if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
+		goto out;
+
+	switch (cmd) {
+	case SIOCINQ: {
+		struct sk_buff *skb;
+		unsigned int amount = 0;
+
+		skb = skb_peek(&sk->sk_receive_queue);
+		if (skb != NULL) {
+			/*
+			 * We will only return the amount of this packet since
+			 * that is all that will be read.
+			 */
+			amount = skb->len;
+		}
+		rc = put_user(amount, (int __user *)arg);
+	}
+		break;
+	default:
+		rc = -ENOIOCTLCMD;
+		break;
+	}
+out:
+	sctp_release_sock(sk);
+	return rc;
 }
 
 /* This is the function which gets called during socket creation to
-- 
1.7.3


  parent reply	other threads:[~2010-09-29  1:51 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-24 14:16 [PATCH] sctp: implement SIOCINQ ioctl() (take 2) 
2010-06-24 14:16 ` Diego Elio 'Flameeyes' Pettenò
2010-09-03 13:47 ` [PATCH] sctp: implement SIOCINQ ioctl() (take 3) Diego Elio Pettenò
2010-09-03 13:47   ` Diego Elio Pettenò
2010-09-08 20:09   ` David Miller
2010-09-08 20:09     ` David Miller
2010-09-29  1:51 ` Diego Elio Pettenò [this message]
2010-09-29  1:51   ` Diego Elio Pettenò
2010-10-01  0:35   ` David Miller
2010-10-01  0:35     ` David Miller
2010-10-01  9:35     ` Diego Elio Pettenò
2010-10-01  9:35       ` Diego Elio Pettenò
2010-10-01  9:56     ` [PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis) Diego Elio Pettenò
2010-10-01  9:56       ` Diego Elio Pettenò
2010-10-15 14:22       ` Diego Elio Pettenò
2010-10-15 14:22         ` Diego Elio Pettenò
2010-10-15 16:59         ` David Miller
2010-10-15 16:59           ` David Miller
2010-10-15 17:08           ` Diego Elio Pettenò
2010-10-15 17:08             ` Diego Elio Pettenò

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285725095-9860-1-git-send-email-flameeyes@gmail.com \
    --to=flameeyes@gmail.com \
    --cc=linux-sctp@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.