From: Peter Oskolkov <posk@google.com>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: Peter Oskolkov <posk.devel@gmail.com>,
Eric Dumazet <edumazet@google.com>,
Peter Oskolkov <posk@google.com>
Subject: [PATCH net-next 2/2] selftests: net: reuseport_addr_any: add DCCP
Date: Sat, 15 Dec 2018 14:27:24 -0800 [thread overview]
Message-ID: <20181215222724.234074-2-posk@google.com> (raw)
In-Reply-To: <20181215222724.234074-1-posk@google.com>
This patch adds coverage of DCCP to reuseport_addr_any selftest.
Signed-off-by: Peter Oskolkov <posk@google.com>
---
.../selftests/net/reuseport_addr_any.c | 49 ++++++++++++++++++-
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/reuseport_addr_any.c b/tools/testing/selftests/net/reuseport_addr_any.c
index f5e01d989519d..4ac3e24b7cfcf 100644
--- a/tools/testing/selftests/net/reuseport_addr_any.c
+++ b/tools/testing/selftests/net/reuseport_addr_any.c
@@ -9,6 +9,7 @@
#include <arpa/inet.h>
#include <errno.h>
#include <error.h>
+#include <linux/dccp.h>
#include <linux/in.h>
#include <linux/unistd.h>
#include <stdbool.h>
@@ -75,7 +76,16 @@ static void build_rcv_fd(int family, int proto, int *rcv_fds, int count,
error(1, errno, "failed to bind receive socket");
if (proto == SOCK_STREAM && listen(rcv_fds[i], 10))
- error(1, errno, "failed to listen on receive port");
+ error(1, errno, "tcp: failed to listen on receive port");
+ else if (proto == SOCK_DCCP) {
+ if (setsockopt(rcv_fds[i], SOL_DCCP,
+ DCCP_SOCKOPT_SERVICE,
+ &(int) {htonl(42)}, sizeof(int)))
+ error(1, errno, "failed to setsockopt");
+
+ if (listen(rcv_fds[i], 10))
+ error(1, errno, "dccp: failed to listen on receive port");
+ }
}
}
@@ -124,6 +134,11 @@ static int connect_and_send(int family, int proto)
if (fd < 0)
error(1, errno, "failed to create send socket");
+ if (proto == SOCK_DCCP &&
+ setsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE,
+ &(int){htonl(42)}, sizeof(int)))
+ error(1, errno, "failed to setsockopt");
+
if (bind(fd, saddr, sz))
error(1, errno, "failed to bind send socket");
@@ -146,7 +161,7 @@ static int receive_once(int epfd, int proto)
if (i < 0)
error(1, errno, "epoll_wait failed");
- if (proto == SOCK_STREAM) {
+ if (proto == SOCK_STREAM || proto == SOCK_DCCP) {
fd = accept(ev.data.fd, NULL, NULL);
if (fd < 0)
error(1, errno, "failed to accept");
@@ -259,6 +274,36 @@ int main(void)
for (i = 0; i < 9; ++i)
close(rcv_fds[i]);
+ fprintf(stderr, "---- DCCP IPv4 ----\n");
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 2, 2, NULL);
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds + 4, 1, IP4_ADDR);
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds + 5, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 7, 2, NULL);
+ test(rcv_fds, 9, AF_INET, SOCK_DCCP, rcv_fds[4]);
+ for (i = 0; i < 9; ++i)
+ close(rcv_fds[i]);
+
+ fprintf(stderr, "---- DCCP IPv6 ----\n");
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 2, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 4, 1, IP6_ADDR);
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds + 5, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 7, 2, NULL);
+ test(rcv_fds, 9, AF_INET6, SOCK_DCCP, rcv_fds[4]);
+ for (i = 0; i < 9; ++i)
+ close(rcv_fds[i]);
+
+ fprintf(stderr, "---- DCCP IPv4 mapped to IPv6 ----\n");
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 2, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 4, 1, IP4_MAPPED6);
+ build_rcv_fd(AF_INET, SOCK_DCCP, rcv_fds + 5, 2, NULL);
+ build_rcv_fd(AF_INET6, SOCK_DCCP, rcv_fds + 7, 2, NULL);
+ test(rcv_fds, 9, AF_INET, SOCK_DCCP, rcv_fds[4]);
+ for (i = 0; i < 9; ++i)
+ close(rcv_fds[i]);
+
fprintf(stderr, "SUCCESS\n");
return 0;
}
--
2.20.0.405.gbc1bbc6f85-goog
next prev parent reply other threads:[~2018-12-15 22:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-15 22:27 [PATCH net-next 1/2] net: dccp: initialize (addr,port) listening hashtable Peter Oskolkov
2018-12-15 22:27 ` Peter Oskolkov [this message]
2018-12-16 20:14 ` [PATCH net-next 2/2] selftests: net: reuseport_addr_any: add DCCP David Miller
2018-12-16 20:14 ` [PATCH net-next 1/2] net: dccp: initialize (addr,port) listening hashtable David Miller
2018-12-16 20:36 ` David Miller
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=20181215222724.234074-2-posk@google.com \
--to=posk@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=netdev@vger.kernel.org \
--cc=posk.devel@gmail.com \
/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 NNTP newsgroup(s).