On 5/5/24 4:35 AM, Geliang Tang wrote:
From: Geliang Tang tanggeliang@kylinos.cn
Include network_helpers.h in prog_tests/sockopt_inherit.c, use public helper start_server_addr() instead of the local defined function start_server(). This can avoid duplicate code.
Add a helper custom_cb() to set SOL_CUSTOM sockopt looply, set it to post_socket_cb pointer of struct network_helper_opts, and pass it to start_server_addr().
Signed-off-by: Geliang Tang tanggeliang@kylinos.cn
.../bpf/prog_tests/sockopt_inherit.c | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c index 917f486db826..ff0694ef5286 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> #include "cgroup_helpers.h" +#include "network_helpers.h" #include "sockopt_inherit.skel.h" @@ -98,23 +99,12 @@ static void *server_thread(void *arg) return (void *)(long)err; } -static int start_server(void) +static int custom_cb(int fd, const struct post_socket_opts *opts) {
- struct sockaddr_in addr = {
.sin_family = AF_INET,.sin_addr.s_addr = htonl(INADDR_LOOPBACK),- }; char buf; int err;
- int fd; int i;
- fd = socket(AF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
log_err("Failed to create server socket");return -1;- }
- for (i = CUSTOM_INHERIT1; i <= CUSTOM_LISTENER; i++) { buf = 0x01; err = setsockopt(fd, SOL_CUSTOM, i, &buf, 1);
There is a close(fd) on the error case a few lines below (not in this diff context). The caller (network_helpers.c) will also close it. I removed the close(fd) from the custom_cb() here.
Thanks for the patches. Applied.
@@ -125,20 +115,21 @@ static int start_server(void) } }
- if (bind(fd, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
log_err("Failed to bind socket");close(fd);return -1;- }
- return fd;
- return 0; }