--- fwsync/patches/ip_fw_nat.patch 2022/08/13 18:08:19 1.1 +++ fwsync/patches/ip_fw_nat.patch 2022/08/18 11:33:20 1.2 @@ -1,13 +1,36 @@ diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c -index d7b31c29d4e..22e6d81886a 100644 +index d7b31c29d4e..a25ecec65a6 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c -@@ -348,6 +348,9 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) +@@ -81,22 +81,6 @@ struct cfg_redir { + LIST_HEAD(spool_chain, cfg_spool) spool_chain; + }; +-/* Nat configuration data struct. */ +-struct cfg_nat { +- /* chain of nat instances */ +- LIST_ENTRY(cfg_nat) _next; +- int id; /* nat id */ +- struct in_addr ip; /* nat ip address */ +- struct libalias *lib; /* libalias instance */ +- int mode; /* aliasing mode */ +- int redir_cnt; /* number of entry in spool chain */ +- /* chain of redir instances */ +- LIST_HEAD(redir_chain, cfg_redir) redir_chain; +- char if_name[IF_NAMESIZE]; /* interface name */ +- u_short alias_port_lo; /* low range for port aliasing */ +- u_short alias_port_hi; /* high range for port aliasing */ +-}; +- + static eventhandler_tag ifaddr_event_tag; + + static void +@@ -348,6 +332,9 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) + c = mtod(mcl, char *); + if (V_sync_alias) -+ V_sync_alias(NULL, NULL); ++ V_sync_alias(t, NULL); + /* Check if this is 'global' instance */ if (t == NULL) {