[PATCH bpf-next v2 4/7] selftests/bpf: Use connect_to_fd in sk_lookup

[Geliang Tang]

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

This patch uses public helper connect_to_fd() exported in network_helpers.h
instead of using make_socket() and connect() in prog_tests/sk_lookup.c.
This can simplify the code.

Signed-off-by: Geliang Tang <tanggeli...@kylinos.cn>
---
 .../testing/selftests/bpf/prog_tests/sk_lookup.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c 
b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
index ba73b56f4484..4a4fc22ed0d2 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
@@ -873,7 +873,6 @@ static void test_redirect_lookup(struct test_sk_lookup 
*skel)
 
 static void drop_on_lookup(const struct test *t)
 {
-       struct sockaddr_storage dst = {};
        int client_fd, server_fd, err;
        struct bpf_link *lookup_link;
        ssize_t n;
@@ -887,12 +886,11 @@ static void drop_on_lookup(const struct test *t)
        if (server_fd < 0)
                goto detach;
 
-       client_fd = make_socket(t->sotype, t->connect_to.ip,
-                               t->connect_to.port, &dst);
+       client_fd = connect_to_fd(server_fd, IO_TIMEOUT_SEC);
        if (client_fd < 0)
                goto close_srv;
 
-       err = connect(client_fd, (void *)&dst, inetaddr_len(&dst));
+       err = 0;
        if (t->sotype == SOCK_DGRAM) {
                err = send_byte(client_fd);
                if (err)
@@ -987,7 +985,6 @@ static void test_drop_on_lookup(struct test_sk_lookup *skel)
 
 static void drop_on_reuseport(const struct test *t)
 {
-       struct sockaddr_storage dst = { 0 };
        int client, server1, server2, err;
        struct bpf_link *lookup_link;
        ssize_t n;
@@ -1011,12 +1008,11 @@ static void drop_on_reuseport(const struct test *t)
        if (server2 < 0)
                goto close_srv1;
 
-       client = make_socket(t->sotype, t->connect_to.ip,
-                            t->connect_to.port, &dst);
+       client = connect_to_fd(server2, IO_TIMEOUT_SEC);
        if (client < 0)
                goto close_srv2;
 
-       err = connect(client, (void *)&dst, inetaddr_len(&dst));
+       err = 0;
        if (t->sotype == SOCK_DGRAM) {
                err = send_byte(client);
                if (err)
@@ -1163,7 +1159,7 @@ static void run_sk_assign_connected(struct test_sk_lookup 
*skel,
        if (server_fd < 0)
                return;
 
-       connected_fd = make_client(sotype, EXT_IP4, EXT_PORT);
+       connected_fd = connect_to_fd(server_fd, IO_TIMEOUT_SEC);
        if (connected_fd < 0)
                goto out_close_server;
 
@@ -1177,7 +1173,7 @@ static void run_sk_assign_connected(struct test_sk_lookup 
*skel,
                goto out_close_connected;
 
        /* Try to redirect TCP SYN / UDP packet to a connected socket */
-       client_fd = make_client(sotype, EXT_IP4, EXT_PORT);
+       client_fd = connect_to_fd(server_fd, IO_TIMEOUT_SEC);
        if (client_fd < 0)
                goto out_unlink_prog;
        if (sotype == SOCK_DGRAM) {
-- 
2.43.0