[RFC mptcp-next v7 9/9] selftests: mptcp: add mptcp tls tests

Geliang Tang posted 9 patches 1 week, 5 days ago
There is a newer version of this series
[RFC mptcp-next v7 9/9] selftests: mptcp: add mptcp tls tests
Posted by Geliang Tang 1 week, 5 days ago
From: Geliang Tang <tanggeliang@kylinos.cn>

With KTLS being implemented, "tls" should no longer be used in
sock_test_tcpulp(), it breaks mptcp_connect.sh tests. Another ULP
name, "smc", is set instead in this patch.

Update the last two TCP TLS tests to MPTCP TLS tests.

Co-developed-by: Gang Yan <yangang@kylinos.cn>
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 .../selftests/net/mptcp/mptcp_connect.c        |  2 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 6fb3c0bf879b..5d1dd7b66ed6 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -324,7 +324,7 @@ static void sock_test_tcpulp(int sock, int proto, unsigned int line)
 		if (ret == 0)
 			X("setsockopt");
 	} else if (proto == IPPROTO_MPTCP) {
-		ret = do_ulp_so(sock, "tls");
+		ret = do_ulp_so(sock, "smc");
 		if (ret != -1)
 			X("setsockopt");
 	}
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 6f8c6a03e760..883b079d8e33 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -4323,28 +4323,28 @@ tls_tests()
 		chk_join_nr 0 0 0
 	fi
 
-	# multiple subflows, tls, TCP
-	if reset "multiple subflows, tls, TCP"; then
+	# multiple subflows, tls, MPTCP
+	if reset "multiple subflows, tls, MPTCP"; then
 		pm_nl_set_limits $ns1 0 2
 		pm_nl_set_limits $ns2 0 2
 		pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
 		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
 		test_linkfail=1024 tls=1 \
-			run_tests $ns1 $ns2 10.0.1.1 TCP TCP
-		chk_join_nr 0 0 0
+			run_tests $ns1 $ns2 10.0.1.1
+		chk_join_nr 2 2 2
 	fi
 
-	# multiple subflows, signal, tls, TCP
-	if reset "multiple subflows, signal, tls, TCP"; then
+	# multiple subflows, signal, tls, MPTCP
+	if reset "multiple subflows, signal, tls, MPTCP"; then
 		pm_nl_set_limits $ns1 0 3
 		pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
 		pm_nl_set_limits $ns2 1 3
 		pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
 		pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
 		test_linkfail=2048 tls=1 \
-			run_tests $ns1 $ns2 10.0.1.1 TCP TCP
-		chk_join_nr 0 0 0
-		chk_add_nr 0 0
+			run_tests $ns1 $ns2 10.0.1.1
+		chk_join_nr 3 3 3
+		chk_add_nr 1 1
 	fi
 }
 
-- 
2.51.0