Skip to contentSkip to conversation

sctp: implement SIOCINQ ioctl() (take 3)

PATCH In review Diego Elio Pettenò 2 participants 7 messages Sep 29, 2010 – Oct 15, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sctp: implement SIOCINQ ioctl() (take 3)

From: Diego Elio 'Flameeyes' Pettenò <[email protected]>

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.

---
 net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)
net/sctp/socket.c +34 -1
index ca44917..199ec05 100644
@@ -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
Signature · 1 line
1.7.3
maintainer
#1 lore raw

From: Diego Elio Pettenò <[email protected]>
Date: Wed, 29 Sep 2010 03:51:35 +0200

net/sctp/socket.c out: · line 3624

Quoted 3 lines
net/sctp/socket.c +3 -0
+		rc = put_user(amount, (int __user *)arg);
+	}
+		break;

Please put the break statement inside of the basic block.

The way you have it here the indentation looks not so nice.

#2 lore raw

Il giorno gio, 30/09/2010 alle 17.35 -0700, David Miller ha scritto:

Quoted 5 lines

Please put the break statement inside of the basic block.

The way you have it here the indentation looks not so nice.

Okay will resend; please do note that I copied the style (and most of the code) from dccp anyway.

Signature · 5 lines
Diego Elio Pettenò — “Flameeyes”
http://blog.flameeyes.eu/

If you found a .asc file in this mail and know not what it is,
it's a GnuPG digital signature: http://www.gnupg.org/
#3 lore raw

PATCH 1/1 sctp: implement SIOCINQ ioctl() (take 3 bis)

In reply to David Miller

From: Diego Elio 'Flameeyes' Pettenò <[email protected]>

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.

---
 net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)
net/sctp/socket.c +34 -1
index ca44917..8872028 100644
@@ -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
Signature · 1 line
1.7.3.1
#4 lore raw

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis)

Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha scritto:

Quoted 9 lines

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.

Any news on getting this one in? Pretty please? :)

Signature · 5 lines
Diego Elio Pettenò — “Flameeyes”
http://blog.flameeyes.eu/

If you found a .asc file in this mail and know not what it is,
it's a GnuPG digital signature: http://www.gnupg.org/
maintainer
#5 lore raw

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis)

From: Diego Elio Pettenò <[email protected]>
Date: Fri, 15 Oct 2010 16:22:37 +0200

Quoted 12 lines

Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha scritto:

Quoted 9 lines

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.

Quoted 1 line

Any news on getting this one in? Pretty please? :)

I'm pretty sure it's in the net-next-2.6, is it not?

#6 lore raw

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis)

Il giorno ven, 15/10/2010 alle 09.59 -0700, David Miller ha scritto:

Quoted 2 lines

I'm pretty sure it's in the net-next-2.6, is it not?

Ah yes it is, sorry, I was mislead by the presence in -rc8 of the other SCTP patches that came afterwards (and because it has been since August I'm dragging this patch around).

Thank you very much!

Signature · 5 lines
Diego Elio Pettenò — “Flameeyes”
http://blog.flameeyes.eu/

If you found a .asc file in this mail and know not what it is,
it's a GnuPG digital signature: http://www.gnupg.org/