From: Daniel Borkmann <dborkman@redhat.com>
To: Hangbin Liu <liuhangbin@gmail.com>
Cc: Trinity <trinity@vger.kernel.org>, davej@redhat.com
Subject: Re: [PATCH v2] net: add inet/inet6 rand_socket sctp support
Date: Fri, 01 Aug 2014 11:39:28 +0200 [thread overview]
Message-ID: <53DB6050.1080203@redhat.com> (raw)
In-Reply-To: <1406858234-25290-1-git-send-email-liuhangbin@gmail.com>
On 08/01/2014 03:57 AM, Hangbin Liu wrote:
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Thanks!
> ---
> net/proto-ipv4.c | 30 +++++++++++++++++++++++-------
> net/proto-ipv6.c | 31 +++++++++++++++++++++++++------
> 2 files changed, 48 insertions(+), 13 deletions(-)
>
> diff --git a/net/proto-ipv4.c b/net/proto-ipv4.c
> index 8babe6d..3e24b54 100644
> --- a/net/proto-ipv4.c
> +++ b/net/proto-ipv4.c
> @@ -97,13 +97,21 @@ void ipv4_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
>
> void inet_rand_socket(struct socket_triplet *st)
> {
> - switch (rand() % 3) {
> - case 0: st->type = SOCK_STREAM; // TCP
> - if (rand_bool())
> + switch (rand() % 4) {
> + case 0: st->type = SOCK_STREAM; // TCP/SCTP
> + switch (rand() % 3) {
> + case 0:
> st->protocol = 0;
> - else
> + break;
> + case 1:
> st->protocol = IPPROTO_TCP;
> - break;
> + break;
> + case 2:
> + st->protocol = IPPROTO_SCTP;
> + break;
> + default:
> + break;
> + }
>
> case 1: st->type = SOCK_DGRAM; // UDP
> if (rand_bool())
> @@ -112,11 +120,19 @@ void inet_rand_socket(struct socket_triplet *st)
> st->protocol = IPPROTO_UDP;
> break;
>
> - case 2: st->type = SOCK_RAW;
> + case 2: st->type = SOCK_SEQPACKET; // SCTP
> + if (rand_bool())
> + st->protocol = 0;
> + else
> + st->protocol = IPPROTO_SCTP;
> + break;
> +
> + case 3: st->type = SOCK_RAW;
> st->protocol = rand() % PROTO_MAX;
> break;
>
> - default:break;
> + default:
> + break;
> }
> }
>
> diff --git a/net/proto-ipv6.c b/net/proto-ipv6.c
> index 16bceb3..02bb373 100644
> --- a/net/proto-ipv6.c
> +++ b/net/proto-ipv6.c
> @@ -29,10 +29,21 @@ void ipv6_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
>
> void inet6_rand_socket(struct socket_triplet *st)
> {
> - switch (rand() % 3) {
> - case 0: st->type = SOCK_STREAM; // TCP
> - st->protocol = 0;
> - break;
> + switch (rand() % 4) {
> + case 0: st->type = SOCK_STREAM; // TCP/SCTP
> + switch (rand() % 3) {
> + case 0:
> + st->protocol = 0;
> + break;
> + case 1:
> + st->protocol = IPPROTO_TCP;
> + break;
> + case 2:
> + st->protocol = IPPROTO_SCTP;
> + break;
> + default:
> + break;
> + }
>
> case 1: st->type = SOCK_DGRAM; // UDP
> if (rand_bool())
> @@ -41,11 +52,19 @@ void inet6_rand_socket(struct socket_triplet *st)
> st->protocol = IPPROTO_UDP;
> break;
>
> - case 2: st->type = SOCK_RAW;
> + case 2: st->type = SOCK_SEQPACKET; // SCTP
> + if (rand_bool())
> + st->protocol = 0;
> + else
> + st->protocol = IPPROTO_SCTP;
> + break;
> +
> + case 3: st->type = SOCK_RAW;
> st->protocol = rand() % PROTO_MAX;
> break;
>
> - default:break;
> + default:
> + break;
> }
> }
>
>
prev parent reply other threads:[~2014-08-01 9:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 1:57 [PATCH v2] net: add inet/inet6 rand_socket sctp support Hangbin Liu
2014-08-01 9:39 ` Daniel Borkmann [this message]
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=53DB6050.1080203@redhat.com \
--to=dborkman@redhat.com \
--cc=davej@redhat.com \
--cc=liuhangbin@gmail.com \
--cc=trinity@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).