Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Use connect_to_addr in cls_redirect

This patch uses public helper connect_to_addr() exported in
network_helpers.h instead of the local defined function connect_to_server()
in prog_tests/cls_redirect.c. This can avoid duplicate code.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/4a03ac92d2d392f8721f398fa449a83ac75577bc.1713427236.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

authored by

Geliang Tang and committed by
Martin KaFai Lau
805b4d90 db9994d0

+1 -17
+1 -17
tools/testing/selftests/bpf/prog_tests/cls_redirect.c
··· 36 36 struct addr_port dst; 37 37 }; 38 38 39 - static int connect_to_server(const struct sockaddr *addr, socklen_t len, 40 - int type) 41 - { 42 - int fd = socket(addr->sa_family, type, 0); 43 - if (CHECK_FAIL(fd == -1)) 44 - return -1; 45 - if (CHECK_FAIL(connect(fd, addr, len))) 46 - goto err; 47 - 48 - return fd; 49 - 50 - err: 51 - close(fd); 52 - return -1; 53 - } 54 - 55 39 static bool fill_addr_port(const struct sockaddr *sa, struct addr_port *ap) 56 40 { 57 41 const struct sockaddr_in6 *in6; ··· 73 89 if (CHECK_FAIL(getsockname(*server, sa, &slen))) 74 90 goto close_server; 75 91 76 - *conn = connect_to_server(sa, slen, type); 92 + *conn = connect_to_addr(type, (struct sockaddr_storage *)sa, slen, NULL); 77 93 if (*conn < 0) 78 94 goto close_server; 79 95