From f6e6e8ad40eed1cbd48122c67a2ca8fd3a293992 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 28 Feb 2024 22:25:04 +1100 Subject: inany: Introduce union sockaddr_inany There are a number of places where we want to handle either a sockaddr_in or a sockaddr_in6. In some of those we use a void *, which works ok and matches some standard library interfaces, but doesn't give a signature level hint that we're dealing with only sockaddr_in or sockaddr_in6, not (say) sockaddr_un or another type of socket address. Other places we use a sockaddr_storage, which also works, but has the same problem in addition to allocating more on the stack than we need to. Introduce union sockaddr_inany to explictly handle this case: it has variants for sockaddr_in and sockaddr_in6. Use it in a number of places where it's easy to do so. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp_splice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tcp_splice.h') diff --git a/tcp_splice.h b/tcp_splice.h index 18193e4..20f41b3 100644 --- a/tcp_splice.h +++ b/tcp_splice.h @@ -7,13 +7,14 @@ #define TCP_SPLICE_H struct tcp_splice_conn; +union sockaddr_inany; void tcp_splice_sock_handler(struct ctx *c, union epoll_ref ref, uint32_t events); bool tcp_splice_conn_from_sock(const struct ctx *c, union tcp_listen_epoll_ref ref, struct tcp_splice_conn *conn, int s, - const struct sockaddr *sa); + const union sockaddr_inany *sa); void tcp_splice_init(struct ctx *c); #endif /* TCP_SPLICE_H */ -- cgit v1.2.3