[PATCH bpf-next v2 2/7] selftests/bpf: Use connect_to_fd in sockmap_ktls

[Geliang Tang]

From: Geliang Tang <tanggeli...@kylinos.cn>

Use public network helper connect_to_fd() instead of open-coding it in
prog_tests/sockmap_ktls.c. This can avoid duplicate code.

Acked-by: Eduard Zingerman <eddy...@gmail.com>
Signed-off-by: Geliang Tang <tanggeli...@kylinos.cn>
---
 .../selftests/bpf/prog_tests/sockmap_ktls.c        | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c 
b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
index 9cc881b38669..68867028c432 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
@@ -21,26 +21,16 @@ static int disconnect(int fd)
 /* Disconnect (unhash) a kTLS socket after removing it from sockmap. */
 static void test_sockmap_ktls_disconnect_after_delete(int family, int map)
 {
-       struct sockaddr_storage addr = {0};
-       socklen_t len = sizeof(addr);
        int err, cli, srv, zero = 0;
 
        srv = start_server(family, SOCK_STREAM, NULL, 0, 0);
        if (srv == -1)
                return;
 
-       err = getsockname(srv, (struct sockaddr *)&addr, &len);
-       if (!ASSERT_OK(err, "getsockopt"))
-               goto close_srv;
-
-       cli = socket(family, SOCK_STREAM, 0);
-       if (!ASSERT_GE(cli, 0, "socket"))
+       cli = connect_to_fd(srv, 0);
+       if (!ASSERT_GE(cli, 0, "connect_to_fd"))
                goto close_srv;
 
-       err = connect(cli, (struct sockaddr *)&addr, len);
-       if (!ASSERT_OK(err, "connect"))
-               goto close_cli;
-
        err = bpf_map_update_elem(map, &zero, &cli, 0);
        if (!ASSERT_OK(err, "bpf_map_update_elem"))
                goto close_cli;
-- 
2.43.0