Re: [PATCH 15/18] conf: Move "all" handling to port specifier

On Tue, 7 Apr 2026 13:16:27 +1000 David Gibson wrote:

Currently -[tTuU] all is handled separately in conf_ports() before calling conf_ports_spec(). Earlier changes mean we can now move this handling to conf_ports_spec(). This makes the code slightly simpler, but more importantly it allows some useful combinations we couldn't previously do, such as -t 127.0.0.1/all or -u %eth2/all

It would probably be good to update the man page at some point with this (we can also leave it undocumented for a while though, as it doesn't break any existing functionality).

Signed-off-by: David Gibson --- conf.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/conf.c b/conf.c index 51612047..fcc75d25 100644 --- a/conf.c +++ b/conf.c @@ -251,6 +251,11 @@ static void conf_ports_spec(const struct ctx *c, const char *p, *ep; unsigned i;

+ if (!strcmp(spec, "all")) { + /* Treat "all" as equivalent to "": all non-ephemeral ports */ + spec = ""; + } + /* Mark all exclusions first, they might be given after base ranges */ for_each_chunk(p, ep, spec, ",") { struct port_range xrange; @@ -372,19 +377,6 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, return; }

- if (!strcmp(optarg, "all")) { - uint8_t exclude[PORT_BITMAP_SIZE] = { 0 }; - - /* Exclude ephemeral ports */ - fwd_port_map_ephemeral(exclude); - - conf_ports_range_except(c, optname, optarg, fwd, - proto, NULL, NULL, - 1, NUM_PORTS - 1, exclude, - 1, FWD_WEAK); - return; - } - strncpy(buf, optarg, sizeof(buf) - 1);

if ((spec = strchr(buf, '/'))) {

-- Stefano