| Message ID | 37b9e2f3c61b4bb73326f6c4e63d562433b59255.1718965270.git.tanggeliang@kylinos.cn (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | use network helpers, part 8 | expand |
On Fri, 2024-06-21 at 18:35 +0800, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > Include network_helpers.h in prog_tests/sockmap_ktls.c, use public network > helper start_server() instead of the local defined function tcp_server(). > This can avoid duplicate code. > > Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> > --- Technically, this is not a one-for-one replacement, as start_server() also does bind() and it's listen backlog is 1, not SOMAXCONN. Looking at the original commit, the difference does not seem to matter. Acked-by: Eduard Zingerman <eddyz87@gmail.com> [...]
diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c index 2d0796314862..9cc881b38669 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c @@ -6,25 +6,11 @@ #include <netinet/tcp.h> #include "test_progs.h" +#include "network_helpers.h" #define MAX_TEST_NAME 80 #define TCP_ULP 31 -static int tcp_server(int family) -{ - int err, s; - - s = socket(family, SOCK_STREAM, 0); - if (!ASSERT_GE(s, 0, "socket")) - return -1; - - err = listen(s, SOMAXCONN); - if (!ASSERT_OK(err, "listen")) - return -1; - - return s; -} - static int disconnect(int fd) { struct sockaddr unspec = { AF_UNSPEC }; @@ -39,7 +25,7 @@ static void test_sockmap_ktls_disconnect_after_delete(int family, int map) socklen_t len = sizeof(addr); int err, cli, srv, zero = 0; - srv = tcp_server(family); + srv = start_server(family, SOCK_STREAM, NULL, 0, 0); if (srv == -1) return;