12:16 p.m.
At this time socket() will fail when requesting an ipv6 mptcp socket.
This is ok for now, as the test script won't request ipv6 tests yet.
Once someone starts to implement mptcp v6 support, just set ipv6=true in
the script and the selftest will attempt to connect via ipv6.
Tested with a tcp <-> tcp connection.
Signed-off-by: Florian Westphal <fw(a)strlen.de>
---
.../selftests/net/mptcp/mptcp_connect.c | 21 +++--
.../selftests/net/mptcp/mptcp_connect.sh | 77 ++++++++++++++++---
2 files changed, 79 insertions(+), 19 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c
b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index c9738a8dcc7f..feca1b729c03 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -37,11 +37,11 @@ static const char *cfg_host;
static const char *cfg_port = "12000";
static int cfg_sock_proto = IPPROTO_MPTCP;
static bool tcpulp_audit;
-
+static int pf = AF_INET;
static void die_usage(void)
{
- fprintf(stderr, "Usage: mptcp_connect [-u] [-s MPTCP|TCP] [-p port] "
+ fprintf(stderr, "Usage: mptcp_connect [-6] [-u] [-s MPTCP|TCP] [-p port] "
"[ -l ] [ -t timeout ] connect_address\n");
exit(1);
}
@@ -94,12 +94,13 @@ static int sock_listen_mptcp(const char * const listenaddr,
.ai_flags = AI_PASSIVE | AI_NUMERICHOST
};
- hints.ai_family = AF_INET;
+ hints.ai_family = pf;
struct addrinfo *a, *addr;
int one = 1;
xgetaddrinfo(listenaddr, port, &hints, &addr);
+ hints.ai_family = pf;
for (a = addr; a; a = a->ai_next) {
sock = socket(a->ai_family, a->ai_socktype, cfg_sock_proto);
@@ -182,7 +183,7 @@ static int sock_connect_mptcp(const char * const remoteaddr,
struct addrinfo *a, *addr;
int sock = -1;
- hints.ai_family = AF_INET;
+ hints.ai_family = pf;
xgetaddrinfo(remoteaddr, port, &hints, &addr);
for (a = addr; a; a = a->ai_next) {
@@ -345,11 +346,9 @@ static int copyfd_io(int infd, int peerfd, int outfd)
static void check_sockaddr(int pf, struct sockaddr_storage *ss,
socklen_t salen)
{
- char addr[INET6_ADDRSTRLEN];
- char serv[INET6_ADDRSTRLEN];
struct sockaddr_in6 *sin6;
struct sockaddr_in *sin;
- int wanted_size = 0;
+ socklen_t wanted_size = 0;
switch (pf) {
case AF_INET:
@@ -512,7 +511,7 @@ static void parse_opts(int argc, char **argv)
{
int c;
- while ((c = getopt(argc, argv, "lp:s:hut:")) != -1) {
+ while ((c = getopt(argc, argv, "6lp:s:hut:")) != -1) {
switch (c) {
case 'l':
listen_mode = true;
@@ -529,6 +528,9 @@ static void parse_opts(int argc, char **argv)
case 'u':
tcpulp_audit = true;
break;
+ case '6':
+ pf = AF_INET6;
+ break;
case 't':
poll_timeout = atoi(optarg) * 1000;
if (poll_timeout <= 0)
@@ -540,6 +542,9 @@ static void parse_opts(int argc, char **argv)
if (optind + 1 != argc)
die_usage();
cfg_host = argv[optind];
+
+ if (strchr(cfg_host, ':'))
+ pf = AF_INET6;
}
int main(int argc, char *argv[])
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index d31fe01824ec..26f8a2dadbe2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -9,6 +9,7 @@ cout=""
ksft_skip=4
capture=0
timeout=30
+ipv6=false
TEST_COUNT=0
@@ -57,29 +58,48 @@ ip link add ns2eth3 netns ns2 type veth peer name ns3eth2 netns ns3
ip link add ns3eth4 netns ns3 type veth peer name ns4eth3 netns ns4
ip -net ns1 addr add 10.0.1.1/24 dev ns1eth2
+if $ipv6 ; then
+ ip -net ns1 addr add dead:beef:1::1/64 dev ns1eth2
+ if [ $? -ne 0 ] ;then
+ echo "SKIP: Can't add ipv6 address, skip ipv6 tests" 1>&2
+ ipv6=false
+ fi
+fi
+
ip -net ns1 link set ns1eth2 up
ip -net ns1 route add default via 10.0.1.2
+$ipv6 && ip -net ns1 route add default via dead:beef:1::2
ip -net ns2 addr add 10.0.1.2/24 dev ns2eth1
+$ipv6 && ip -net ns2 addr add dead:beef:1::2/64 dev ns2eth1
ip -net ns2 link set ns2eth1 up
ip -net ns2 addr add 10.0.2.1/24 dev ns2eth3
+$ipv6 && ip -net ns2 addr add dead:beef:2::1/64 dev ns2eth3
ip -net ns2 link set ns2eth3 up
ip -net ns2 route add default via 10.0.2.2
+$ipv6 && ip -net ns2 route add default via dead:beef:2::2
ip netns exec ns2 sysctl -q net.ipv4.ip_forward=1
+$ipv6 && ip netns exec ns2 sysctl -q net.ipv6.conf.all.forwarding=1
ip -net ns3 addr add 10.0.2.2/24 dev ns3eth2
+$ipv6 && ip -net ns3 addr add dead:beef:2::2/64 dev ns3eth2
ip -net ns3 link set ns3eth2 up
ip -net ns3 addr add 10.0.3.2/24 dev ns3eth4
+$ipv6 && ip -net ns3 addr add dead:beef:3::2/64 dev ns3eth4
ip -net ns3 link set ns3eth4 up
ip -net ns3 route add default via 10.0.2.1
+$ipv6 && ip -net ns3 route add default via dead:beef:2::1
ip netns exec ns3 ethtool -K ns3eth2 tso off 2>/dev/null
ip netns exec ns3 sysctl -q net.ipv4.ip_forward=1
+$ipv6 && ip netns exec ns3 sysctl -q net.ipv6.conf.all.forwarding=1
ip -net ns4 addr add 10.0.3.1/24 dev ns4eth3
+$ipv6 && ip -net ns4 addr add dead:beef:3::1/64 dev ns4eth3
ip -net ns4 link set ns4eth3 up
ip -net ns4 route add default via 10.0.3.2
+$ipv6 && ip -net ns4 route add default via dead:beef:3::2
print_file_err()
{
@@ -161,7 +181,11 @@ do_ping()
if [ $? -ne 0 ] ; then
echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2
ret=1
+
+ return 1
fi
+
+ return 0
}
do_transfer()
@@ -171,6 +195,7 @@ do_transfer()
cl_proto="$3"
srv_proto="$4"
connect_addr="$5"
+ local_addr="$6"
port=$((10000+$TEST_COUNT))
TEST_COUNT=$((TEST_COUNT+1))
@@ -196,7 +221,7 @@ do_transfer()
sleep 1
fi
- ip netns exec ${listener_ns} ./mptcp_connect -t $timeout -l -p $port -s ${srv_proto}
0.0.0.0 < "$sin" > "$sout" &
+ ip netns exec ${listener_ns} ./mptcp_connect -t $timeout -l -p $port -s ${srv_proto}
$local_addr < "$sin" > "$sout" &
spid=$!
sleep 1
@@ -264,23 +289,26 @@ run_tests()
listener_ns="$1"
connector_ns="$2"
connect_addr="$3"
+ local_addr="$4"
lret=0
for proto in MPTCP TCP;do
- do_transfer ${listener_ns} ${connector_ns} MPTCP "$proto" ${connect_addr}
+ do_transfer ${listener_ns} ${connector_ns} MPTCP "$proto" ${connect_addr}
${local_addr}
lret=$?
if [ $lret -ne 0 ]; then
ret=$lret
- return
+ return 1
fi
done
- do_transfer ${listener_ns} ${connector_ns} TCP MPTCP ${connect_addr}
+ do_transfer ${listener_ns} ${connector_ns} TCP MPTCP ${connect_addr} ${local_addr}
lret=$?
if [ $lret -ne 0 ]; then
ret=$lret
- return
+ return 1
fi
+
+ return 0
}
make_file "$cin" "client"
@@ -290,16 +318,31 @@ check_mptcp_disabled
check_mptcp_ulp_setsockopt
+# Allow DAD to finish
+$ipv6 && sleep 2
+
for sender in 1 2 3 4;do
do_ping ns1 ns$sender 10.0.1.1
+ if $ipv6;then
+ do_ping ns1 ns$sender dead:beef:1::1
+ if [ $? -ne 0 ]; then
+ echo "SKIP: IPv6 tests" 2>&1
+ ipv6=false
+ fi
+ fi
do_ping ns2 ns$sender 10.0.1.2
+ $ipv6 && do_ping ns2 ns$sender dead:beef:1::2
do_ping ns2 ns$sender 10.0.2.1
+ $ipv6 && do_ping ns2 ns$sender dead:beef:2::1
do_ping ns3 ns$sender 10.0.2.2
+ $ipv6 && do_ping ns3 ns$sender dead:beef:2::2
do_ping ns3 ns$sender 10.0.3.2
+ $ipv6 && do_ping ns3 ns$sender dead:beef:3::2
do_ping ns4 ns$sender 10.0.3.1
+ $ipv6 && do_ping ns4 ns$sender dead:beef:3::1
done
loss=$((RANDOM%101))
@@ -328,15 +371,27 @@ elif [ $delay -gt 0 ]; then
fi
for sender in 1 2 3 4;do
- run_tests ns1 ns$sender 10.0.1.1
+ run_tests ns1 ns$sender 10.0.1.1 0.0.0.0
+ if $ipv6;then
+ run_tests ns1 ns$sender dead:beef:1::1 ::
+ if [ $? -ne 0 ] ;then
+ echo "SKIP: IPv6 tests" 2>&1
+ ipv6=false
+ fi
+ fi
- run_tests ns2 ns$sender 10.0.1.2
- run_tests ns2 ns$sender 10.0.2.1
+ run_tests ns2 ns$sender 10.0.1.2 0.0.0.0
+ $ipv6 && run_tests ns2 ns$sender dead:beef:1::2 ::
+ run_tests ns2 ns$sender 10.0.2.1 0.0.0.0
+ $ipv6 && run_tests ns2 ns$sender dead:beef:2::1 ::
- run_tests ns3 ns$sender 10.0.2.2
- run_tests ns3 ns$sender 10.0.3.2
+ run_tests ns3 ns$sender 10.0.2.2 0.0.0.0
+ $ipv6 && run_tests ns3 ns$sender dead:beef:2::2 ::
+ run_tests ns3 ns$sender 10.0.3.2 0.0.0.0
+ $ipv6 && run_tests ns3 ns$sender dead:beef:3::2 ::
- run_tests ns4 ns$sender 10.0.3.1
+ run_tests ns4 ns$sender 10.0.3.1 0.0.0.0
+ $ipv6 && run_tests ns4 ns$sender dead:beef:3::1 ::
done
exit $ret
--
2.23.0