selftests/bpf: Use connect_to_addr in test_sock_addr

This patch uses public network helper connect_to_addr() exported in
network_helpers.h instead of the local defined function connect_to_server()
in test_sock_addr.c. This can avoid duplicate code.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/f263797712d93fdfaf2943585c5dfae56714a00b.1713868264.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/test_sock_addr.c b/tools/testing/selftests/bpf/test_sock_addr.c
index ca4fb142b7b7fa2c225855c12644e23adf1c6757..2e29dd9d8fc3748a223b1ae22c4164fe7664cb2d 100644 (file)
--- a/tools/testing/selftests/bpf/test_sock_addr.c
+++ b/tools/testing/selftests/bpf/test_sock_addr.c
@@ -940,38 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)
        return cmp_sock_addr(getpeername, sock1, addr2, /*cmp_port*/ 1);
 }
 
-static int connect_to_server(int type, const struct sockaddr_storage *addr,
-                            socklen_t addr_len)
-{
-       int domain;
-       int fd = -1;
-
-       domain = addr->ss_family;
-
-       if (domain != AF_INET && domain != AF_INET6) {
-               log_err("Unsupported address family");
-               goto err;
-       }
-
-       fd = socket(domain, type, 0);
-       if (fd == -1) {
-               log_err("Failed to create client socket");
-               goto err;
-       }
-
-       if (connect(fd, (const struct sockaddr *)addr, addr_len) == -1) {
-               log_err("Fail to connect to server");
-               goto err;
-       }
-
-       goto out;
-err:
-       close(fd);
-       fd = -1;
-out:
-       return fd;
-}
-
 int init_pktinfo(int domain, struct cmsghdr *cmsg)
 {
        struct in6_pktinfo *pktinfo6;
@@ -1156,7 +1124,7 @@ static int run_bind_test_case(const struct sock_addr_test *test)
                goto err;
 
        /* Try to connect to server just in case */
-       clientfd = connect_to_server(test->type, &expected_addr, addr_len);
+       clientfd = connect_to_addr(test->type, &expected_addr, addr_len, NULL);
        if (clientfd == -1)
                goto err;
 
@@ -1188,7 +1156,7 @@ static int run_connect_test_case(const struct sock_addr_test *test)
        if (servfd == -1)
                goto err;
 
-       clientfd = connect_to_server(test->type, &requested_addr, addr_len);
+       clientfd = connect_to_addr(test->type, &requested_addr, addr_len, NULL);
        if (clientfd == -1)
                goto err;