admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: Use connect_to_fd in test_tcp_check_syncookie

Browse Source 
This patch uses public helper connect_to_fd() exported in network_helpers.h
instead of the local defined function connect_to_server() in
test_tcp_check_syncookie_user.c. This can avoid duplicate code.

Then the arguments "addr" and "len" of run_test() become useless, drop them
too.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/e0ae6b790ac0abc7193aadfb2660c8c9eb0fe1f0.1714907662.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
Geliang Tang
2024-05-05 19:35:12 +08:00
committed by Martin KaFai Lau
parent 5059c73eca
commit 65a3f0df44
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
View File

@@ -18,30 +18,6 @@
#include "cgroup_helpers.h"
#include "network_helpers.h"
static int connect_to_server(const struct sockaddr *addr, socklen_t len)
{
int fd = -1;
fd = socket(addr->sa_family, SOCK_STREAM, 0);
if (fd == -1) {
log_err("Failed to create client socket");
goto out;
}
if (connect(fd, (const struct sockaddr *)addr, len) == -1) {
log_err("Fail to connect to server");
goto close_out;
}
goto out;
close_out:
close(fd);
fd = -1;
out:
return fd;
}
static int get_map_fd_by_prog_id(int prog_id, bool *xdp)
{
struct bpf_prog_info info = {};
@@ -80,8 +56,7 @@ err:
return map_fd;
}
static int run_test(int server_fd, int results_fd, bool xdp,
const struct sockaddr *addr, socklen_t len)
static int run_test(int server_fd, int results_fd, bool xdp)
{
int client = -1, srv_client = -1;
int ret = 0;
@@ -107,7 +82,7 @@ static int run_test(int server_fd, int results_fd, bool xdp,
goto err;
}
client = connect_to_server(addr, len);
client = connect_to_fd(server_fd, 0);
if (client == -1)
goto err;
@@ -254,16 +229,13 @@ int main(int argc, char **argv)
if (server_dual == -1 || !get_port(server_dual, &addr4dual.sin_port))
goto err;
if (run_test(server, results, xdp,
(const struct sockaddr *)&addr4, sizeof(addr4)))
if (run_test(server, results, xdp))
goto err;
if (run_test(server_v6, results, xdp,
(const struct sockaddr *)&addr6, sizeof(addr6)))
if (run_test(server_v6, results, xdp))
goto err;
if (run_test(server_dual, results, xdp,
(const struct sockaddr *)&addr4dual, sizeof(addr4dual)))
if (run_test(server_dual, results, xdp))
goto err;
printf("ok\n");