Skip to content

Commit 49e1fa8

Browse files
Geliang TangMartin KaFai Lau
authored andcommitted
selftests/bpf: Use start_server_addr in test_tcp_check_syncookie
Include network_helpers.h in test_tcp_check_syncookie_user.c, use public helper start_server_addr() in it instead of the local defined function start_server(). This can avoid duplicate code. Add two helpers v6only_true() and v6only_false() to set IPV6_V6ONLY sockopt to true or false, set them to post_socket_cb pointer of struct network_helper_opts, and pass it to start_server_setsockopt(). In order to use functions defined in network_helpers.c, Makefile needs to be updated too. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> Link: https://lore.kernel.org/r/e0c5324f5da84f453f47543536e70f126eaa8678.1714907662.git.tanggeliang@kylinos.cn Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
1 parent 5166b3e commit 49e1fa8

2 files changed

Lines changed: 25 additions & 44 deletions

File tree

tools/testing/selftests/bpf/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS)
310310
$(OUTPUT)/test_maps: $(TESTING_HELPERS)
311311
$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(UNPRIV_HELPERS)
312312
$(OUTPUT)/xsk.o: $(BPFOBJ)
313+
$(OUTPUT)/test_tcp_check_syncookie_user: $(NETWORK_HELPERS)
313314

314315
BPFTOOL ?= $(DEFAULT_BPFTOOL)
315316
$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \

tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,7 @@
1616
#include <bpf/libbpf.h>
1717

1818
#include "cgroup_helpers.h"
19-
20-
static int start_server(const struct sockaddr *addr, socklen_t len, bool dual)
21-
{
22-
int mode = !dual;
23-
int fd;
24-
25-
fd = socket(addr->sa_family, SOCK_STREAM, 0);
26-
if (fd == -1) {
27-
log_err("Failed to create server socket");
28-
goto out;
29-
}
30-
31-
if (addr->sa_family == AF_INET6) {
32-
if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&mode,
33-
sizeof(mode)) == -1) {
34-
log_err("Failed to set the dual-stack mode");
35-
goto close_out;
36-
}
37-
}
38-
39-
if (bind(fd, addr, len) == -1) {
40-
log_err("Failed to bind server socket");
41-
goto close_out;
42-
}
43-
44-
if (listen(fd, 128) == -1) {
45-
log_err("Failed to listen on server socket");
46-
goto close_out;
47-
}
48-
49-
goto out;
50-
51-
close_out:
52-
close(fd);
53-
fd = -1;
54-
out:
55-
return fd;
56-
}
19+
#include "network_helpers.h"
5720

5821
static int connect_to_server(const struct sockaddr *addr, socklen_t len)
5922
{
@@ -216,8 +179,23 @@ static bool get_port(int server_fd, in_port_t *port)
216179
return true;
217180
}
218181

182+
static int v6only_true(int fd, const struct post_socket_opts *opts)
183+
{
184+
int mode = true;
185+
186+
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
187+
}
188+
189+
static int v6only_false(int fd, const struct post_socket_opts *opts)
190+
{
191+
int mode = false;
192+
193+
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
194+
}
195+
219196
int main(int argc, char **argv)
220197
{
198+
struct network_helper_opts opts = { 0 };
221199
struct sockaddr_in addr4;
222200
struct sockaddr_in6 addr6;
223201
struct sockaddr_in addr4dual;
@@ -259,18 +237,20 @@ int main(int argc, char **argv)
259237
addr6dual.sin6_addr = in6addr_any;
260238
addr6dual.sin6_port = 0;
261239

262-
server = start_server((const struct sockaddr *)&addr4, sizeof(addr4),
263-
false);
240+
server = start_server_addr(SOCK_STREAM, (struct sockaddr_storage *)&addr4,
241+
sizeof(addr4), NULL);
264242
if (server == -1 || !get_port(server, &addr4.sin_port))
265243
goto err;
266244

267-
server_v6 = start_server((const struct sockaddr *)&addr6,
268-
sizeof(addr6), false);
245+
opts.post_socket_cb = v6only_true;
246+
server_v6 = start_server_addr(SOCK_STREAM, (struct sockaddr_storage *)&addr6,
247+
sizeof(addr6), &opts);
269248
if (server_v6 == -1 || !get_port(server_v6, &addr6.sin6_port))
270249
goto err;
271250

272-
server_dual = start_server((const struct sockaddr *)&addr6dual,
273-
sizeof(addr6dual), true);
251+
opts.post_socket_cb = v6only_false;
252+
server_dual = start_server_addr(SOCK_STREAM, (struct sockaddr_storage *)&addr6dual,
253+
sizeof(addr6dual), &opts);
274254
if (server_dual == -1 || !get_port(server_dual, &addr4dual.sin_port))
275255
goto err;
276256

0 commit comments

Comments
 (0)