mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: Remove overly cryptic selection of forward table

Browse source 
In a couple of places in conf(), we use a local 'fwd' variable to reference
one of our forwarding tables.  The value depends on which command line
option we're currently looking at, and is initialized rather cryptically
from an assignment side-effect within the if condition checking that
option.

Newer versions of cppcheck complain about this assignment being an always
true condition, but in any case it's both clearer and slightly shorter to
use separate if branches for the two cases and set the forwarding parameter
more directly.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2023-09-29 15:50:20 +10:00 committed by Stefano Brivio
parent 6471c7d01b
commit c0efa4e97f
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
conf.c
View file

@ -1742,14 +1742,12 @@ void conf(struct ctx *c, int argc, char **argv)
/* Inbound port options can be parsed now (after IPv4/IPv6 settings) */ /* Inbound port options can be parsed now (after IPv4/IPv6 settings) */
optind = 1; optind = 1;
do { do {
struct port_fwd *fwd;
name = getopt_long(argc, argv, optstring, options, NULL); name = getopt_long(argc, argv, optstring, options, NULL);
if ((name == 't' && (fwd = &c->tcp.fwd_in)) || if (name == 't')
(name == 'u' && (fwd = &c->udp.fwd_in.f))) { conf_ports(c, name, optarg, &c->tcp.fwd_in);
conf_ports(c, name, optarg, fwd); else if (name == 'u')
} conf_ports(c, name, optarg, &c->udp.fwd_in.f);
} while (name != -1); } while (name != -1);
if (c->mode == MODE_PASTA) if (c->mode == MODE_PASTA)
@ -1777,14 +1775,12 @@ void conf(struct ctx *c, int argc, char **argv)
/* ...and outbound port options now that namespaces are set up. */ /* ...and outbound port options now that namespaces are set up. */
optind = 1; optind = 1;
do { do {
struct port_fwd *fwd;
name = getopt_long(argc, argv, optstring, options, NULL); name = getopt_long(argc, argv, optstring, options, NULL);
if ((name == 'T' && (fwd = &c->tcp.fwd_out)) || if (name == 'T')
(name == 'U' && (fwd = &c->udp.fwd_out.f))) { conf_ports(c, name, optarg, &c->tcp.fwd_out);
conf_ports(c, name, optarg, fwd); else if (name == 'U')
} conf_ports(c, name, optarg, &c->udp.fwd_out.f);
} while (name != -1); } while (name != -1);
if (!c->ifi4) if (!c->ifi4)