Commit ed31adf6 authored by Geliang Tang's avatar Geliang Tang Committed by Martin KaFai Lau

selftests/bpf: Drop struct post_socket_opts

It's not possible to have one generic/common "struct post_socket_opts"
for all tests. It's better to have the individual test define its own
callback opts struct.

So this patch drops struct post_socket_opts, and changes the second
parameter of post_socket_cb as "void *" type.
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/f8bda41c7cb9cb6979b2779f89fb3a684234304f.1716638248.git.tanggeliang@kylinos.cnSigned-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent eb4e7726
...@@ -133,7 +133,7 @@ int start_server(int family, int type, const char *addr_str, __u16 port, ...@@ -133,7 +133,7 @@ int start_server(int family, int type, const char *addr_str, __u16 port,
return __start_server(type, (struct sockaddr *)&addr, addrlen, &opts); return __start_server(type, (struct sockaddr *)&addr, addrlen, &opts);
} }
static int reuseport_cb(int fd, const struct post_socket_opts *opts) static int reuseport_cb(int fd, void *opts)
{ {
int on = 1; int on = 1;
......
...@@ -21,8 +21,6 @@ typedef __u16 __sum16; ...@@ -21,8 +21,6 @@ typedef __u16 __sum16;
#define VIP_NUM 5 #define VIP_NUM 5
#define MAGIC_BYTES 123 #define MAGIC_BYTES 123
struct post_socket_opts {};
struct network_helper_opts { struct network_helper_opts {
const char *cc; const char *cc;
int timeout_ms; int timeout_ms;
...@@ -30,7 +28,7 @@ struct network_helper_opts { ...@@ -30,7 +28,7 @@ struct network_helper_opts {
bool noconnect; bool noconnect;
int type; int type;
int proto; int proto;
int (*post_socket_cb)(int fd, const struct post_socket_opts *opts); int (*post_socket_cb)(int fd, void *opts);
}; };
/* ipv4 test vector */ /* ipv4 test vector */
......
...@@ -70,7 +70,7 @@ static void *server_thread(void *arg) ...@@ -70,7 +70,7 @@ static void *server_thread(void *arg)
return (void *)(long)err; return (void *)(long)err;
} }
static int custom_cb(int fd, const struct post_socket_opts *opts) static int custom_cb(int fd, void *opts)
{ {
char buf; char buf;
int err; int err;
......
...@@ -139,14 +139,14 @@ static int run_test(int server_fd, int results_fd, bool xdp) ...@@ -139,14 +139,14 @@ static int run_test(int server_fd, int results_fd, bool xdp)
return ret; return ret;
} }
static int v6only_true(int fd, const struct post_socket_opts *opts) static int v6only_true(int fd, void *opts)
{ {
int mode = true; int mode = true;
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode)); return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
} }
static int v6only_false(int fd, const struct post_socket_opts *opts) static int v6only_false(int fd, void *opts)
{ {
int mode = false; int mode = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment