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

Pass entire port forwarding configuration substructure to conf_ports()

Browse source 
conf_ports() switches on the optname argument to select the target array
for several updates.  Now that all these maps are in a common structure, we
can simplify by just passing in a pointer to the whole struct port_fwd to
update.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2022-09-24 19:08:20 +10:00 committed by Stefano Brivio
parent f5a31ee94c
commit 0d1886dca0
1 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
conf.c
View file

@ -111,58 +111,40 @@ static int get_bound_ports_ns(void *arg)
* @c: Execution context * @c: Execution context
* @optname: Short option name, t, T, u, or U * @optname: Short option name, t, T, u, or U
* @optarg: Option argument (port specification) * @optarg: Option argument (port specification)
* @set: Pointer to @port_fwd_mode to be set (port forwarding mode) * @fwd: Pointer to @port_fwd to be updated
* *
* Return: -EINVAL on parsing error, 0 otherwise * Return: -EINVAL on parsing error, 0 otherwise
*/ */
static int conf_ports(struct ctx *c, char optname, const char *optarg, static int conf_ports(const struct ctx *c, char optname, const char *optarg,
enum port_fwd_mode *set) struct port_fwd *fwd)
{ {
int start_src, end_src, start_dst, end_dst, exclude_only = 1, i, port; int start_src, end_src, start_dst, end_dst, exclude_only = 1, i, port;
char addr_buf[sizeof(struct in6_addr)] = { 0 }, *addr = addr_buf; char addr_buf[sizeof(struct in6_addr)] = { 0 }, *addr = addr_buf;
uint8_t exclude[PORT_BITMAP_SIZE] = { 0 }; uint8_t exclude[PORT_BITMAP_SIZE] = { 0 };
char buf[BUFSIZ], *sep, *spec, *p; char buf[BUFSIZ], *sep, *spec, *p;
sa_family_t af = AF_UNSPEC; sa_family_t af = AF_UNSPEC;
in_port_t *delta;
uint8_t *map;
if (optname == 't') {
map = c->tcp.fwd_in.map;
delta = c->tcp.fwd_in.delta;
} else if (optname == 'T') {
map = c->tcp.fwd_out.map;
delta = c->tcp.fwd_out.delta;
} else if (optname == 'u') {
map = c->udp.fwd_in.f.map;
delta = c->udp.fwd_in.f.delta;
} else if (optname == 'U') {
map = c->udp.fwd_out.f.map;
delta = c->udp.fwd_out.f.delta;
} else { /* For gcc -O3 */
return 0;
}
if (!strcmp(optarg, "none")) { if (!strcmp(optarg, "none")) {
if (*set) if (fwd->mode)
return -EINVAL; return -EINVAL;
*set = FWD_NONE; fwd->mode = FWD_NONE;
return 0; return 0;
} }
if (!strcmp(optarg, "auto")) { if (!strcmp(optarg, "auto")) {
if (*set || c->mode != MODE_PASTA) if (fwd->mode || c->mode != MODE_PASTA)
return -EINVAL; return -EINVAL;
*set = FWD_AUTO; fwd->mode = FWD_AUTO;
return 0; return 0;
} }
if (!strcmp(optarg, "all")) { if (!strcmp(optarg, "all")) {
int i; int i;
if (*set || c->mode != MODE_PASST) if (fwd->mode || c->mode != MODE_PASST)
return -EINVAL; return -EINVAL;
*set = FWD_ALL; fwd->mode = FWD_ALL;
memset(map, 0xff, PORT_EPHEMERAL_MIN / 8); memset(fwd->map, 0xff, PORT_EPHEMERAL_MIN / 8);
for (i = 0; i < PORT_EPHEMERAL_MIN; i++) { for (i = 0; i < PORT_EPHEMERAL_MIN; i++) {
if (optname == 't') if (optname == 't')
@ -174,10 +156,10 @@ static int conf_ports(struct ctx *c, char optname, const char *optarg,
return 0; return 0;
} }
if (*set > FWD_SPEC) if (fwd->mode > FWD_SPEC)
return -EINVAL; return -EINVAL;
*set = FWD_SPEC; fwd->mode = FWD_SPEC;
strncpy(buf, optarg, sizeof(buf) - 1); strncpy(buf, optarg, sizeof(buf) - 1);
@ -265,7 +247,7 @@ static int conf_ports(struct ctx *c, char optname, const char *optarg,
if (bitmap_isset(exclude, i)) if (bitmap_isset(exclude, i))
continue; continue;
bitmap_set(map, i); bitmap_set(fwd->map, i);
if (optname == 't') if (optname == 't')
tcp_sock_init(c, 0, af, addr, i); tcp_sock_init(c, 0, af, addr, i);
@ -355,17 +337,17 @@ static int conf_ports(struct ctx *c, char optname, const char *optarg,
goto bad; /* 22-81:8022:8080 */ goto bad; /* 22-81:8022:8080 */
for (i = start_src; i <= end_src; i++) { for (i = start_src; i <= end_src; i++) {
if (bitmap_isset(map, i)) if (bitmap_isset(fwd->map, i))
goto overlap; goto overlap;
if (bitmap_isset(exclude, i)) if (bitmap_isset(exclude, i))
continue; continue;
bitmap_set(map, i); bitmap_set(fwd->map, i);
if (start_dst != -1) { if (start_dst != -1) {
/* 80:8080 or 22-80:8080:8080 */ /* 80:8080 or 22-80:8080:8080 */
delta[i] = (in_port_t)(start_dst - fwd->delta[i] = (in_port_t)(start_dst -
start_src); start_src);
} }
@ -1548,7 +1530,7 @@ void conf(struct ctx *c, int argc, char **argv)
/* Now we can process port configuration options */ /* Now we can process port configuration options */
optind = 1; optind = 1;
do { do {
enum port_fwd_mode *fwd = NULL; struct port_fwd *fwd = NULL;
const char *optstring; const char *optstring;
if (c->mode == MODE_PASST) if (c->mode == MODE_PASST)
@ -1563,13 +1545,13 @@ void conf(struct ctx *c, int argc, char **argv)
case 'T': case 'T':
case 'U': case 'U':
if (name == 't') if (name == 't')
fwd = &c->tcp.fwd_in.mode; fwd = &c->tcp.fwd_in;
else if (name == 'T') else if (name == 'T')
fwd = &c->tcp.fwd_out.mode; fwd = &c->tcp.fwd_out;
else if (name == 'u') else if (name == 'u')
fwd = &c->udp.fwd_in.f.mode; fwd = &c->udp.fwd_in.f;
else if (name == 'U') else if (name == 'U')
fwd = &c->udp.fwd_out.f.mode; fwd = &c->udp.fwd_out.f;
if (!optarg || conf_ports(c, name, optarg, fwd)) if (!optarg || conf_ports(c, name, optarg, fwd))
usage(argv[0]); usage(argv[0]);