From: Shan Wei <shanwei@cn•fujitsu.com>
To: "Diego Elio Pettenò" <flameeyes@gmail•com>
Cc: netdev@vger•kernel.org, linux-sctp@vger•kernel.org,
Vlad Yasevich <vladislav.yasevich@hp•com>
Subject: Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
Date: Fri, 03 Sep 2010 10:03:42 +0800 [thread overview]
Message-ID: <4C80577E.7050005@cn.fujitsu.com> (raw)
In-Reply-To: <1283476464-14341-1-git-send-email-flameeyes@gmail.com>
Forward to linux-sctp maillist.
Diego Elio Pettenò wrote, at 09/03/2010 09:14 AM:
> 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.
lack of your singed-of-by.
--
Best Regards
-----
Shan Wei
> ---
> 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..54c01e4 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 long 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
next prev parent reply other threads:[~2010-09-03 2:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-03 1:14 [PATCH] sctp: implement SIOCINQ ioctl() (take 2) Diego Elio Pettenò
2010-09-03 2:03 ` Shan Wei [this message]
2010-09-03 6:55 ` Eric Dumazet
2010-09-03 12:39 ` Diego Elio Pettenò
2010-09-03 13:28 ` Eric Dumazet
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=4C80577E.7050005@cn.fujitsu.com \
--to=shanwei@cn$(echo .)fujitsu.com \
--cc=flameeyes@gmail$(echo .)com \
--cc=linux-sctp@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vladislav.yasevich@hp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox