Commit c29083f3 authored by Geliang Tang's avatar Geliang Tang Committed by Daniel Borkmann
Browse files

selftests/bpf: Use start_server in bpf_tcp_ca 



To simplify the code, use BPF selftests helper start_server() 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: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/9926a79118db27dd6d91c4854db011c599cabd0e.1711331517.git.tanggeliang@kylinos.cn
parent 476a5e92

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

+1 −12
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) 


	WRITE_ONCE(stop, 0);



	lfd = socket(AF_INET6, SOCK_STREAM, 0);

	lfd = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);

	if (!ASSERT_NEQ(lfd, -1, "socket"))

		return;
@@ -103,21 +103,10 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) 
	    settimeo(lfd, 0) || settimeo(fd, 0))

		goto done;



	/* bind, listen and start server thread to accept */

	sa6.sin6_family = AF_INET6;

	sa6.sin6_addr = in6addr_loopback;

	err = bind(lfd, (struct sockaddr *)&sa6, addrlen);

	if (!ASSERT_NEQ(err, -1, "bind"))

		goto done;



	err = getsockname(lfd, (struct sockaddr *)&sa6, &addrlen);

	if (!ASSERT_NEQ(err, -1, "getsockname"))

		goto done;



	err = listen(lfd, 1);

	if (!ASSERT_NEQ(err, -1, "listen"))

		goto done;



	if (sk_stg_map) {

		err = bpf_map_update_elem(bpf_map__fd(sk_stg_map), &fd,

					  &expected_stg, BPF_NOEXIST);