[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/01/2014 03:57 AM, Hangbin Liu wrote:
Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx>

Acked-by: Daniel Borkmann <dborkman@xxxxxxxxxx>

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;
  	}
  }


--
To unsubscribe from this list: send the line "unsubscribe trinity" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux SCSI]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux