From dcf5c0eb1e877f1de84c94bb07c30d109cb85b70 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 3 Nov 2023 13:23:02 +1100 Subject: port_fwd: Move port scanning /proc fds into struct port_fwd Currently we store /proc/net fds used to implement automatic port forwarding in the proc_net_{tcp,udp} fields of the main context structure. However, in fact each of those is associated with a particular direction of forwarding, and we already have struct port_fwd which collects all other information related to a particular direction of port forwarding. We can simplify things a bit by moving the /proc fds into struct port_fwd. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- passt.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'passt.h') diff --git a/passt.h b/passt.h index 282bd1a..53defa4 100644 --- a/passt.h +++ b/passt.h @@ -203,8 +203,6 @@ struct ip6_ctx { * @no_netns_quit: In pasta mode, don't exit if fs-bound namespace is gone * @netns_base: Base name for fs-bound namespace, if any, in pasta mode * @netns_dir: Directory of fs-bound namespace, if any, in pasta mode - * @proc_net_tcp: Stored handles for /proc/net/tcp{,6} in init and ns - * @proc_net_udp: Stored handles for /proc/net/udp{,6} in init and ns * @epollfd: File descriptor for epoll instance * @fd_tap_listen: File descriptor for listening AF_UNIX socket, if any * @fd_tap: AF_UNIX socket, tuntap device, or pre-opened socket @@ -258,9 +256,6 @@ struct ctx { char netns_base[PATH_MAX]; char netns_dir[PATH_MAX]; - int proc_net_tcp[IP_VERSIONS][2]; - int proc_net_udp[IP_VERSIONS][2]; - int epollfd; int fd_tap_listen; int fd_tap; -- cgit v1.2.3