* [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
@ 2010-09-03 1:14 Diego Elio Pettenò
2010-09-03 2:03 ` Shan Wei
2010-09-03 6:55 ` Eric Dumazet
0 siblings, 2 replies; 8+ messages in thread
From: Diego Elio Pettenò @ 2010-09-03 1:14 UTC (permalink / raw)
To: netdev; +Cc: Diego Elio 'Flameeyes' Pettenò
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.
---
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
--
1.7.2.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
2010-09-03 1:14 [PATCH] sctp: implement SIOCINQ ioctl() (take 2) Diego Elio Pettenò
@ 2010-09-03 2:03 ` Shan Wei
2010-09-03 6:55 ` Eric Dumazet
1 sibling, 0 replies; 8+ messages in thread
From: Shan Wei @ 2010-09-03 2:03 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: netdev, linux-sctp, Vlad Yasevich
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
@ 2010-09-03 2:03 ` Shan Wei
0 siblings, 0 replies; 8+ messages in thread
From: Shan Wei @ 2010-09-03 2:03 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: netdev, linux-sctp, Vlad Yasevich
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
2010-09-03 1:14 [PATCH] sctp: implement SIOCINQ ioctl() (take 2) Diego Elio Pettenò
2010-09-03 2:03 ` Shan Wei
@ 2010-09-03 6:55 ` Eric Dumazet
2010-09-03 12:39 ` Diego Elio Pettenò
1 sibling, 1 reply; 8+ messages in thread
From: Eric Dumazet @ 2010-09-03 6:55 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: netdev
Le vendredi 03 septembre 2010 à 03:14 +0200, Diego Elio Pettenò a
écrit :
> 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.
> ---
> 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;
why use an 'unsigned long', since user pointer is a 'int *' ?
> +
> + 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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
2010-09-03 6:55 ` Eric Dumazet
@ 2010-09-03 12:39 ` Diego Elio Pettenò
2010-09-03 13:28 ` Eric Dumazet
0 siblings, 1 reply; 8+ messages in thread
From: Diego Elio Pettenò @ 2010-09-03 12:39 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev
Il giorno ven, 03/09/2010 alle 08.55 +0200, Eric Dumazet ha scritto:
>
>
> why use an 'unsigned long', since user pointer is a 'int *' ?
I really just picked up the basic SIOCINQ from UDP/RDP
--
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/
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
2010-09-03 12:39 ` Diego Elio Pettenò
@ 2010-09-03 13:28 ` Eric Dumazet
0 siblings, 0 replies; 8+ messages in thread
From: Eric Dumazet @ 2010-09-03 13:28 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: netdev
Le vendredi 03 septembre 2010 à 14:39 +0200, Diego Elio Pettenò a
écrit :
> Il giorno ven, 03/09/2010 alle 08.55 +0200, Eric Dumazet ha scritto:
> >
> >
> > why use an 'unsigned long', since user pointer is a 'int *' ?
>
> I really just picked up the basic SIOCINQ from UDP/RDP
>
I see, dont copy it then :)
net/ipv4/udp.c is right :
case SIOCOUTQ:
{
int amount = sk_wmem_alloc_get(sk);
return put_user(amount, (int __user *)arg);
}
case SIOCINQ:
{
unsigned int amount = first_packet_length(sk);
if (amount)
/*
* We will only return the amount
* of this packet since that is all
* that will be read.
*/
amount -= sizeof(struct udphdr);
return put_user(amount, (int __user *)arg);
}
Lets try to make it right too for sctp ;)
Thanks
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
@ 2010-06-24 14:16 ` Diego Elio 'Flameeyes' Pettenò
0 siblings, 0 replies; 8+ messages in thread
From: @ 2010-06-24 14:16 UTC (permalink / raw)
To: linux-kernel, linux-sctp
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(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 44a1ab0..f339383 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
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] sctp: implement SIOCINQ ioctl() (take 2)
@ 2010-06-24 14:16 ` Diego Elio 'Flameeyes' Pettenò
0 siblings, 0 replies; 8+ messages in thread
From: Diego Elio 'Flameeyes' Pettenò @ 2010-06-24 14:16 UTC (permalink / raw)
To: linux-kernel, linux-sctp
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(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 44a1ab0..f339383 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
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-09-03 13:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-03 1:14 [PATCH] sctp: implement SIOCINQ ioctl() (take 2) Diego Elio Pettenò
2010-09-03 2:03 ` Shan Wei
2010-09-03 2:03 ` Shan Wei
2010-09-03 6:55 ` Eric Dumazet
2010-09-03 12:39 ` Diego Elio Pettenò
2010-09-03 13:28 ` Eric Dumazet
-- strict thread matches above, loose matches on Subject: below --
2010-06-24 14:16
2010-06-24 14:16 ` Diego Elio 'Flameeyes' Pettenò
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.