From b15e97cb9d0008faccd4df80aa218523a548f2ff Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 1 Sep 2021 15:58:17 +0200 Subject: [PATCH] conf: Introduce PASST_LEGACY_NO_OPTIONS ifdef for legacy Before introducing options, the default behaviour in passt mode was to forward all ports, to run in foreground and to log to stderr. Make it a bit more convenient to restore that at build time. Signed-off-by: Stefano Brivio --- conf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conf.c b/conf.c index 3c49ab1..fd8f3cf 100644 --- a/conf.c +++ b/conf.c @@ -1144,6 +1144,18 @@ void conf(struct ctx *c, int argc, char **argv) if (!*c->pasta_ifn) strncpy(c->pasta_ifn, c->ifn, IFNAMSIZ); +#ifdef PASST_LEGACY_NO_OPTIONS + if (c->mode == MODE_PASST) { + c->foreground = 1; + c->stderr = 1; + + if (!tcp_tap) { + memset(c->tcp.port_to_tap, 0xff, + PORT_EPHEMERAL_MIN / 8); + } + } +#endif + if (c->mode == MODE_PASTA) { if (!tcp_tap || tcp_tap == PORT_AUTO) { ns_ports_arg.proto = IPPROTO_TCP;