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

port_fwd: Split TCP and UDP cases for get_bound_ports()

Browse source 
Currently get_bound_ports() takes a parameter to determine if it scans for
UDP or TCP bound ports, but in fact there's almost nothing in common
between those two paths.  The parameter appears primarily to have been
a convenience for when we needed to invoke this function via NS_CALL().

Now that we don't need that, split it into separate TCP and UDP versions.

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-11-03 13:23:01 +11:00 committed by Stefano Brivio
parent 180dbc957a
commit 1a40d00895
3 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
port_fwd.c
View file

@ -68,45 +68,55 @@ static void procfs_scan_listen(int fd, unsigned int lstate,
} }
/** /**
* get_bound_ports() - Get maps of ports with bound sockets * get_bound_ports_tcp() - Get maps of TCP ports with bound sockets
* @c: Execution context * @c: Execution context
* @ns: If set, set bitmaps for ports to tap/ns -- to init otherwise * @ns: If set, set bitmaps for ports to tap/ns -- to init otherwise
* @proto: Protocol number (IPPROTO_TCP or IPPROTO_UDP)
*/ */
void get_bound_ports(struct ctx *c, int ns, uint8_t proto) void get_bound_ports_tcp(struct ctx *c, int ns)
{ {
uint8_t *udp_map, *udp_excl, *tcp_map, *tcp_excl; uint8_t *map, *excl;
if (ns) { if (ns) {
udp_map = c->udp.fwd_in.f.map; map = c->tcp.fwd_in.map;
udp_excl = c->udp.fwd_out.f.map; excl = c->tcp.fwd_out.map;
tcp_map = c->tcp.fwd_in.map;
tcp_excl = c->tcp.fwd_out.map;
} else { } else {
udp_map = c->udp.fwd_out.f.map; map = c->tcp.fwd_out.map;
udp_excl = c->udp.fwd_in.f.map; excl = c->tcp.fwd_in.map;
tcp_map = c->tcp.fwd_out.map;
tcp_excl = c->tcp.fwd_in.map;
} }
if (proto == IPPROTO_UDP) { memset(map, 0, PORT_BITMAP_SIZE);
memset(udp_map, 0, PORT_BITMAP_SIZE); procfs_scan_listen(c->proc_net_tcp[V4][ns], TCP_LISTEN, map, excl);
procfs_scan_listen(c->proc_net_udp[V4][ns], procfs_scan_listen(c->proc_net_tcp[V6][ns], TCP_LISTEN, map, excl);
UDP_LISTEN, udp_map, udp_excl); }
procfs_scan_listen(c->proc_net_udp[V6][ns],
UDP_LISTEN, udp_map, udp_excl);
procfs_scan_listen(c->proc_net_tcp[V4][ns], /**
TCP_LISTEN, udp_map, udp_excl); * get_bound_ports_udp() - Get maps of UDP ports with bound sockets
procfs_scan_listen(c->proc_net_tcp[V6][ns], * @c: Execution context
TCP_LISTEN, udp_map, udp_excl); * @ns: If set, set bitmaps for ports to tap/ns -- to init otherwise
} else if (proto == IPPROTO_TCP) { */
memset(tcp_map, 0, PORT_BITMAP_SIZE); void get_bound_ports_udp(struct ctx *c, int ns)
procfs_scan_listen(c->proc_net_tcp[V4][ns], {
TCP_LISTEN, tcp_map, tcp_excl); uint8_t *map, *excl;
procfs_scan_listen(c->proc_net_tcp[V6][ns],
TCP_LISTEN, tcp_map, tcp_excl); if (ns) {
map = c->udp.fwd_in.f.map;
excl = c->udp.fwd_out.f.map;
} else {
map = c->udp.fwd_out.f.map;
excl = c->udp.fwd_in.f.map;
} }
memset(map, 0, PORT_BITMAP_SIZE);
procfs_scan_listen(c->proc_net_udp[V4][ns], UDP_LISTEN, map, excl);
procfs_scan_listen(c->proc_net_udp[V6][ns], UDP_LISTEN, map, excl);
/* Also forward UDP ports with the same numbers as bound TCP ports.
* This is useful for a handful of protocols (e.g. iperf3) where a TCP
* control port is used to set up transfers on a corresponding UDP
* port.
*/
procfs_scan_listen(c->proc_net_tcp[V4][ns], TCP_LISTEN, map, excl);
procfs_scan_listen(c->proc_net_tcp[V6][ns], TCP_LISTEN, map, excl);
} }
/** /**
@ -125,21 +135,21 @@ void port_fwd_init(struct ctx *c)
if (c->tcp.fwd_in.mode == FWD_AUTO) { if (c->tcp.fwd_in.mode == FWD_AUTO) {
c->proc_net_tcp[V4][1] = open_in_ns(c, "/proc/net/tcp", flags); c->proc_net_tcp[V4][1] = open_in_ns(c, "/proc/net/tcp", flags);
c->proc_net_tcp[V6][1] = open_in_ns(c, "/proc/net/tcp6", flags); c->proc_net_tcp[V6][1] = open_in_ns(c, "/proc/net/tcp6", flags);
get_bound_ports(c, 1, IPPROTO_TCP); get_bound_ports_tcp(c, 1);
} }
if (c->udp.fwd_in.f.mode == FWD_AUTO) { if (c->udp.fwd_in.f.mode == FWD_AUTO) {
c->proc_net_udp[V4][1] = open_in_ns(c, "/proc/net/udp", flags); c->proc_net_udp[V4][1] = open_in_ns(c, "/proc/net/udp", flags);
c->proc_net_udp[V6][1] = open_in_ns(c, "/proc/net/udp6", flags); c->proc_net_udp[V6][1] = open_in_ns(c, "/proc/net/udp6", flags);
get_bound_ports(c, 1, IPPROTO_UDP); get_bound_ports_udp(c, 1);
} }
if (c->tcp.fwd_out.mode == FWD_AUTO) { if (c->tcp.fwd_out.mode == FWD_AUTO) {
c->proc_net_tcp[V4][0] = open("/proc/net/tcp", flags); c->proc_net_tcp[V4][0] = open("/proc/net/tcp", flags);
c->proc_net_tcp[V6][0] = open("/proc/net/tcp6", flags); c->proc_net_tcp[V6][0] = open("/proc/net/tcp6", flags);
get_bound_ports(c, 0, IPPROTO_TCP); get_bound_ports_tcp(c, 0);
} }
if (c->udp.fwd_out.f.mode == FWD_AUTO) { if (c->udp.fwd_out.f.mode == FWD_AUTO) {
c->proc_net_udp[V4][0] = open("/proc/net/udp", flags); c->proc_net_udp[V4][0] = open("/proc/net/udp", flags);
c->proc_net_udp[V6][0] = open("/proc/net/udp6", flags); c->proc_net_udp[V6][0] = open("/proc/net/udp6", flags);
get_bound_ports(c, 0, IPPROTO_UDP); get_bound_ports_udp(c, 0);
} }
} }

3
port_fwd.h
View file

@ -31,7 +31,8 @@ struct port_fwd {
in_port_t delta[NUM_PORTS]; in_port_t delta[NUM_PORTS];
}; };
void get_bound_ports(struct ctx *c, int ns, uint8_t proto); void get_bound_ports_tcp(struct ctx *c, int ns);
void get_bound_ports_udp(struct ctx *c, int ns);
void port_fwd_init(struct ctx *c); void port_fwd_init(struct ctx *c);
#endif /* PORT_FWD_H */ #endif /* PORT_FWD_H */

4
tcp.c
View file

@ -3287,13 +3287,13 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
struct tcp_port_rebind_arg rebind_arg = { c, 0 }; struct tcp_port_rebind_arg rebind_arg = { c, 0 };
if (c->tcp.fwd_out.mode == FWD_AUTO) { if (c->tcp.fwd_out.mode == FWD_AUTO) {
get_bound_ports(c, 0, IPPROTO_TCP); get_bound_ports_tcp(c, 0);
rebind_arg.bind_in_ns = 1; rebind_arg.bind_in_ns = 1;
NS_CALL(tcp_port_rebind, &rebind_arg); NS_CALL(tcp_port_rebind, &rebind_arg);
} }
if (c->tcp.fwd_in.mode == FWD_AUTO) { if (c->tcp.fwd_in.mode == FWD_AUTO) {
get_bound_ports(c, 1, IPPROTO_TCP); get_bound_ports_tcp(c, 1);
rebind_arg.bind_in_ns = 0; rebind_arg.bind_in_ns = 0;
tcp_port_rebind(&rebind_arg); tcp_port_rebind(&rebind_arg);
} }