From 3c6ae625101aee6ddf94e0fd85ce3a9c9067c3bf Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Sun, 1 May 2022 06:36:34 +0200 Subject: conf, tcp, udp: Allow address specification for forwarded ports This feature is available in slirp4netns but was missing in passt and pasta. Given that we don't do dynamic memory allocation, we need to bind sockets while parsing port configuration. This means we need to process all other options first, as they might affect addressing and IP version support. It also implies a minor rework of how TCP and UDP implementations bind sockets. Signed-off-by: Stefano Brivio --- util.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'util.h') diff --git a/util.h b/util.h index 5172bf6..f85a87a 100644 --- a/util.h +++ b/util.h @@ -170,13 +170,6 @@ enum { #include "packet.h" -enum bind_type { - BIND_ANY = 0, - BIND_LOOPBACK, - BIND_LL, - BIND_EXT, -}; - struct ctx; struct ipv6hdr { @@ -213,8 +206,8 @@ void passt_vsyslog(int pri, const char *format, va_list ap); void __setlogmask(int mask); char *ipv6_l4hdr(const struct pool *p, int index, size_t offset, uint8_t *proto, size_t *dlen); -int sock_l4(const struct ctx *c, int af, uint8_t proto, uint16_t port, - enum bind_type bind_addr, uint32_t data); +int sock_l4(const struct ctx *c, int af, uint8_t proto, + const void *bind_addr, uint16_t port, uint32_t data); void sock_probe_mem(struct ctx *c); int timespec_diff_ms(const struct timespec *a, const struct timespec *b); void bitmap_set(uint8_t *map, int bit); -- cgit v1.2.3