Message ID | 1285926965-5130-1-git-send-email-flameeyes@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha scritto: > > > 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? :)
From: Diego Elio Pettenò <flameeyes@gmail.com> Date: Fri, 15 Oct 2010 16:22:37 +0200 > Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha > scritto: >> >> >> 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? :) I'm pretty sure it's in the net-next-2.6, is it not? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Il giorno ven, 15/10/2010 alle 09.59 -0700, David Miller ha scritto: > > 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!
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index ca44917..8872028 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