diff options
| author | Geliang Tang <tanggeliang@kylinos.cn> | 2024-04-21 19:56:51 +0800 |
|---|---|---|
| committer | Geliang Tang <tanggeliang@kylinos.cn> | 2024-04-21 20:27:37 +0800 |
| commit | 3096999b91cbf6a86e35aa5057551498edb5d510 (patch) | |
| tree | 85f061770ac207515e9fb7c6498e781805d3d4b7 | |
| parent | a42ac63db9364f65323cccbfce126e985f04f609 (diff) | |
| download | mptcp_net-next-3096999b91cbf6a86e35aa5057551498edb5d510.tar.gz | |
selftests/bpf: Make start_mptcp_server static
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
| -rw-r--r-- | tools/testing/selftests/bpf/network_helpers.c | 7 | ||||
| -rw-r--r-- | tools/testing/selftests/bpf/network_helpers.h | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/mptcp.c | 16 |
3 files changed, 16 insertions, 9 deletions
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c index b9d204a1a48087..4f16f7d6ce3fb3 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -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) { diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h index 5a8c5cf4ec1aa7..c62b54daa9146a 100644 --- a/tools/testing/selftests/bpf/network_helpers.h +++ b/tools/testing/selftests/bpf/network_helpers.h @@ -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); diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index 3312c1c1cf4e62..796576e1c1591e 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -104,6 +104,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; |