* [PATCH v2] net: add inet/inet6 rand_socket sctp support
@ 2014-08-01 1:57 Hangbin Liu
2014-08-01 9:39 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: Hangbin Liu @ 2014-08-01 1:57 UTC (permalink / raw)
To: Trinity; +Cc: Daniel Borkmann, Hangbin Liu
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
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;
}
}
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] net: add inet/inet6 rand_socket sctp support
2014-08-01 1:57 [PATCH v2] net: add inet/inet6 rand_socket sctp support Hangbin Liu
@ 2014-08-01 9:39 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2014-08-01 9:39 UTC (permalink / raw)
To: Hangbin Liu; +Cc: Trinity, davej
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;
> }
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-01 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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 NNTP newsgroup(s).