At present, we don't keep track of the fds for listening sockets (except
for "auto" ones). Since the fd is stored in the epoll reference, we didn't
need an alternative source of it for the various handlers.
However, we're intending to allow dynamic changes to forwarding
configuration in future. That means we need a way to enumerate sockets so
we can close them on removal of a forward.
Extend our forwarding table data structure to make space for all the
listening sockets. To avoid allocation, this imposes another limit: we
could run out of space for socket fds before we run out of forwarding
entries.
We don't actually do anything with the allocate space yet. Plus, for
"auto" forwards the new space is redundant with existing arrays. We'll fix
both of those in later patches.
Signed-off-by: David Gibson
---
fwd.c | 8 ++++++++
fwd.h | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/fwd.c b/fwd.c
index 5e5dc58c..5215cee9 100644
--- a/fwd.c
+++ b/fwd.c
@@ -332,12 +332,15 @@ void fwd_table_add(struct fwd_ports *fwd, uint8_t flags,
{
/* Flags which can be set from the caller */
const uint8_t allowed_flags = FWD_WEAK | FWD_SCAN;
+ unsigned num = (unsigned)last - first + 1, i;
struct fwd_entry *new;
ASSERT(!(flags & ~allowed_flags));
if (fwd->count >= ARRAY_SIZE(fwd->tab))
die("Too many port forwarding ranges");
+ if ((fwd->listen_sock_count + num) > ARRAY_SIZE(fwd->listen_socks))
+ die("Too many listening sockets");
new = &fwd->tab[fwd->count++];
new->flags = flags;
@@ -358,6 +361,11 @@ void fwd_table_add(struct fwd_ports *fwd, uint8_t flags,
new->last = last;
new->to = to;
+
+ new->socks = &fwd->listen_socks[fwd->listen_sock_count];
+ fwd->listen_sock_count += num;
+ for (i = 0; i < num; i++)
+ new->socks[i] = -1;
}
/**
diff --git a/fwd.h b/fwd.h
index eef507c6..84c463e2 100644
--- a/fwd.h
+++ b/fwd.h
@@ -23,6 +23,7 @@ bool fwd_port_is_ephemeral(in_port_t port);
* @first: First port number to forward
* @last: Last port number to forward
* @to: Port number to forward port @first to.
+ * @socks: Array of listening sockets for this entry
* @flags: Flag mask
* FWD_DUAL_STACK - forward both IPv4 and IPv6 (requires @addr be ::)
* FWD_WEAK - Don't give an error if binds fail for some forwards
@@ -34,6 +35,7 @@ struct fwd_entry {
union inany_addr addr;
char ifname[IFNAMSIZ];
in_port_t first, last, to;
+ int *socks;
#define FWD_DUAL_STACK BIT(0)
#define FWD_WEAK BIT(1)
#define FWD_SCAN BIT(2)
@@ -52,6 +54,13 @@ enum fwd_ports_mode {
#define PORT_BITMAP_SIZE DIV_ROUND_UP(NUM_PORTS, 8)
+/* Maximum number of listening sockets (per pif & protocol)
+ *
+ * Rationale: This lets us listen on every port for two addresses (which we need
+ * for -T auto without SO_BINDTODEVICE), plus a comfortable number of extras.
+ */
+#define MAX_LISTEN_SOCKS (NUM_PORTS * 3)
+
/**
* fwd_ports() - Describes port forwarding for one protocol and direction
* @mode: Overall forwarding mode (all, none, auto, specific ports)
@@ -68,6 +77,8 @@ struct fwd_ports {
struct fwd_entry tab[MAX_FWDS];
uint8_t map[PORT_BITMAP_SIZE];
in_port_t delta[NUM_PORTS];
+ unsigned listen_sock_count;
+ int listen_socks[MAX_LISTEN_SOCKS];
};
#define FWD_PORT_SCAN_INTERVAL 1000 /* ms */
--
2.52.0