From 74c1c5efcfec9fcdb6efe0c8d377af2a7d8e4b0a Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 5 Jul 2024 20:43:59 +1000 Subject: util: sock_l4() determine protocol from epoll type rather than the reverse sock_l4() creates a socket of the given IP protocol number, and adds it to the epoll state. Currently it determines the correct tag for the epoll data based on the protocol. However, we have some future cases where we might want different semantics, and therefore epoll types, for sockets of the same protocol. So, change sock_l4() to take the epoll type as an explicit parameter, and determine the protocol from that. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util.h') diff --git a/util.h b/util.h index eebb027..d015039 100644 --- a/util.h +++ b/util.h @@ -137,13 +137,14 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags, #include #include +#include "epoll_type.h" #include "packet.h" struct ctx; /* cppcheck-suppress funcArgNamesDifferent */ __attribute__ ((weak)) int ffsl(long int i) { return __builtin_ffsl(i); } -int sock_l4(const struct ctx *c, sa_family_t af, uint8_t proto, +int sock_l4(const struct ctx *c, sa_family_t af, enum epoll_type type, const void *bind_addr, const char *ifname, uint16_t port, uint32_t data); void sock_probe_mem(struct ctx *c); -- cgit v1.2.3