Commit 044032ee authored by Geliang Tang's avatar Geliang Tang Committed by Martin KaFai Lau
Browse files

selftests/bpf: Make start_mptcp_server static 



start_mptcp_server() shouldn't be a public helper, it only be used in
MPTCP tests. This patch moves it into prog_tests/mptcp.c, and implenments
it using make_sockaddr() and start_server_addr() instead of using
start_server_proto().

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/50ec7049e280c60a2924937940851f8fee2b73b8.1714014697.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 95b88500

tools/testing/selftests/bpf/network_helpers.c

+0 −7
Original line number Diff line number Diff line
@@ -142,13 +142,6 @@ int start_server(int family, int type, const char *addr_str, __u16 port, 
	return start_server_proto(family, type, 0, addr_str, port, timeout_ms);

}



int start_mptcp_server(int family, const char *addr_str, __u16 port,

		       int timeout_ms)

{

	return start_server_proto(family, SOCK_STREAM, IPPROTO_MPTCP, addr_str,

				  port, timeout_ms);

}



int *start_reuseport_server(int family, int type, const char *addr_str,

			    __u16 port, int timeout_ms, unsigned int nr_listens)

{

tools/testing/selftests/bpf/network_helpers.h

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ extern struct ipv6_packet pkt_v6; 
int settimeo(int fd, int timeout_ms);

int start_server(int family, int type, const char *addr, __u16 port,

		 int timeout_ms);

int start_mptcp_server(int family, const char *addr, __u16 port,

		       int timeout_ms);

int *start_reuseport_server(int family, int type, const char *addr_str,

			    __u16 port, int timeout_ms,

			    unsigned int nr_listens);

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

+16 −0
Original line number Diff line number Diff line
@@ -82,6 +82,22 @@ static void cleanup_netns(struct nstoken *nstoken) 
	SYS_NOFAIL("ip netns del %s", NS_TEST);

}



static int start_mptcp_server(int family, const char *addr_str, __u16 port,

			      int timeout_ms)

{

	struct network_helper_opts opts = {

		.timeout_ms	= timeout_ms,

		.proto		= IPPROTO_MPTCP,

	};

	struct sockaddr_storage addr;

	socklen_t addrlen;



	if (make_sockaddr(family, addr_str, port, &addr, &addrlen))

		return -1;



	return start_server_addr(SOCK_STREAM, &addr, addrlen, &opts);

}



static int verify_tsk(int map_fd, int client_fd)

{

	int err, cfd = client_fd;