[PATCH bpf-next v3 4/8] selftests/bpf: Add start_server_str helper

Geliang Tang
2024-05-22T09:24:21Z

It's a tech debt that start_server() does not take the "opts" argument.
It's pretty handy to have start_server() as a helper that takes string
address.

So this patch creates a new helper start_server_str(). Then start_server()
can be a wrapper of it.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++-----
tools/testing/selftests/bpf/network_helpers.h | 2 ++
2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 49e807ffcccb..ba80005d2d7a 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -119,6 +119,21 @@ static int __start_server(const struct sockaddr *addr, socklen_t addrlen,
return -1;
}

+int start_server_str(int family, const char *addr_str, __u16 port,
+ const struct network_helper_opts *opts)
+{
+ struct sockaddr_storage addr;
+ socklen_t addrlen;
+
+ if (!opts)
+ opts = &default_opts;
+
+ if (make_sockaddr(family, addr_str, port, &addr, &addrlen))
+ return -1;
+
+ return __start_server((struct sockaddr *)&addr, addrlen, opts);
+}
+
int start_server(int family, int type, const char *addr_str, __u16 port,
int timeout_ms)
{
@@ -126,13 +141,8 @@ int start_server(int family, int type, const char *addr_str, __u16 port,
.type = type,
.timeout_ms = timeout_ms,
};
- struct sockaddr_storage addr;
- socklen_t addrlen;
-
- if (make_sockaddr(family, addr_str, port, &addr, &addrlen))
- return -1;

- return __start_server((struct sockaddr *)&addr, addrlen, &opts);
+ return start_server_str(family, addr_str, port, &opts);
}

static int reuseport_cb(int fd, void *opts)
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index c925c771bd98..d1d28d4f92bd 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -48,6 +48,8 @@ struct ipv6_packet {
extern struct ipv6_packet pkt_v6;

int settimeo(int fd, int timeout_ms);
+int start_server_str(int family, const char *addr_str, __u16 port,
+ const struct network_helper_opts *opts);
int start_server(int family, int type, const char *addr, __u16 port,
int timeout_ms);
int *start_reuseport_server(int family, int type, const char *addr_str,
--
2.43.0