diff mbox series

[bpf-next,01/15] selftests/bpf: Use start_server_str in skc_to_unix_sock

Message ID ef82cdec1a33202e3d97d7624f04c7c992f0420b.1721771340.git.tanggeliang@kylinos.cn
State New
Headers show
Series [bpf-next,01/15] selftests/bpf: Use start_server_str in skc_to_unix_sock | expand

Commit Message

Geliang Tang July 23, 2024, 10:22 p.m. UTC 
From: Geliang Tang <tanggeliang@kylinos.cn>

This patch uses network helper start_server_str() in skc_to_unix_sock
test in skc_to_unix_sock.c to simplify the code.

This is the first time to use start_server_str() for a AF_UNIX socket.
The first "@" of "sun_path" needs to be skipped by make_sockaddr(), so
path string "sock_path + 1" ("skc_to_unix_sock") is passed to the helper,
not "sock_path" ("@skc_to_unix_sock").

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 .../bpf/prog_tests/skc_to_unix_sock.c         | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c b/tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c
index 3eefdfed1db9..4c23409a3072 100644
--- a/tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c
+++ b/tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c
@@ -4,13 +4,16 @@ 
 #include <test_progs.h>
 #include <sys/un.h>
 #include "test_skc_to_unix_sock.skel.h"
+#include "network_helpers.h"
 
 static const char *sock_path = "@skc_to_unix_sock";
 
 void test_skc_to_unix_sock(void)
 {
+	struct network_helper_opts opts = {
+		.backlog = 1,
+	};
 	struct test_skc_to_unix_sock *skel;
-	struct sockaddr_un sockaddr;
 	int err, sockfd = 0;
 
 	skel = test_skc_to_unix_sock__open();
@@ -28,21 +31,8 @@  void test_skc_to_unix_sock(void)
 		goto cleanup;
 
 	/* trigger unix_listen */
-	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (!ASSERT_GT(sockfd, 0, "socket failed"))
-		goto cleanup;
-
-	memset(&sockaddr, 0, sizeof(sockaddr));
-	sockaddr.sun_family = AF_UNIX;
-	strncpy(sockaddr.sun_path, sock_path, strlen(sock_path));
-	sockaddr.sun_path[0] = '\0';
-
-	err = bind(sockfd, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
-	if (!ASSERT_OK(err, "bind failed"))
-		goto cleanup;
-
-	err = listen(sockfd, 1);
-	if (!ASSERT_OK(err, "listen failed"))
+	sockfd = start_server_str(AF_UNIX, SOCK_STREAM, sock_path + 1, 0, &opts);
+	if (!ASSERT_OK_FD(sockfd, "start_server_str"))
 		goto cleanup;
 
 	ASSERT_EQ(strcmp(skel->bss->path, sock_path), 0, "bpf_skc_to_unix_sock failed");