Skip to content

Commit e5e1a3a

Browse files
Geliang TangMartin KaFai Lau
Geliang Tang
authored and
Martin KaFai Lau
committed
selftests/bpf: Use connect_fd_to_fd in bpf_tcp_ca
To simplify the code, use BPF selftests helper connect_fd_to_fd() in bpf_tcp_ca.c instead of open-coding it. This helper is defined in network_helpers.c, and exported in network_helpers.h, which is already included in bpf_tcp_ca.c. Signed-off-by: Geliang Tang <[email protected]> Link: https://lore.kernel.org/r/e105d1f225c643bee838409378dd90fd9aabb6dc.1711447102.git.tanggeliang@kylinos.cn Signed-off-by: Martin KaFai Lau <[email protected]>
1 parent e874208 commit e5e1a3a

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ static void *server(void *arg)
7979

8080
static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
8181
{
82-
struct sockaddr_in6 sa6 = {};
8382
ssize_t nr_recv = 0, bytes = 0;
8483
int lfd = -1, fd = -1;
8584
pthread_t srv_thread;
86-
socklen_t addrlen = sizeof(sa6);
8785
void *thread_ret;
8886
char batch[1500];
8987
int err;
@@ -104,10 +102,6 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
104102
settimeo(lfd, 0) || settimeo(fd, 0))
105103
goto done;
106104

107-
err = getsockname(lfd, (struct sockaddr *)&sa6, &addrlen);
108-
if (!ASSERT_NEQ(err, -1, "getsockname"))
109-
goto done;
110-
111105
if (sk_stg_map) {
112106
err = bpf_map_update_elem(bpf_map__fd(sk_stg_map), &fd,
113107
&expected_stg, BPF_NOEXIST);
@@ -116,7 +110,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
116110
}
117111

118112
/* connect to server */
119-
err = connect(fd, (struct sockaddr *)&sa6, addrlen);
113+
err = connect_fd_to_fd(fd, lfd, 0);
120114
if (!ASSERT_NEQ(err, -1, "connect"))
121115
goto done;
122116

0 commit comments

Comments
 (0)