--- fwsync/driver/fwsync_mod.c 2022/08/10 00:03:50 1.6 +++ fwsync/driver/fwsync_mod.c 2022/08/13 18:16:39 1.7 @@ -26,8 +26,8 @@ struct cfg_sync fws_cfg; struct task fws_sndpkt_task; struct taskqueue *fws_tq; struct callout fws_co; -struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u; -fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt; +struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u, fws_mtx_n; +fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt, fwsync_natpkt; SYSCTL_NODE(_net_inet_ip, IFT_FWSYNC, fwsync, CTLFLAG_RW, 0, "IPFW Sync - Sync firewall states"); SYSCTL_INT(_net_inet_ip_fwsync, OID_AUTO, debug, CTLFLAG_RW, &fwsync_debug, 0, "Debug driver"); @@ -57,6 +57,14 @@ fws_fini(void *arg) taskqueue_free(fws_tq); } + mtx_lock(&fws_mtx_n); + while (!TAILQ_EMPTY(&fwsync_natpkt)) { + p = TAILQ_FIRST(&fwsync_natpkt); + TAILQ_REMOVE(&fwsync_natpkt, p, sp_next); + free(p, M_FWSYNC); + } + mtx_unlock(&fws_mtx_n); + mtx_lock(&fws_mtx_u); while (!TAILQ_EMPTY(&fwsync_updpkt)) { p = TAILQ_FIRST(&fwsync_updpkt); @@ -76,6 +84,7 @@ fws_fini(void *arg) mtx_destroy(&fws_mtx_c); mtx_destroy(&fws_mtx_e); mtx_destroy(&fws_mtx_u); + mtx_destroy(&fws_mtx_n); fwsync_hooked = 0; @@ -109,9 +118,11 @@ fws_init(void *arg) TAILQ_INIT(&fwsync_sndpkt); TAILQ_INIT(&fwsync_updpkt); + TAILQ_INIT(&fwsync_natpkt); /* mutexes */ - mtx_init(&fws_mtx_u, "fwsync mtx update", NULL, MTX_DEF); + mtx_init(&fws_mtx_n, "fwsync mtx alias", NULL, MTX_DEF); + mtx_init(&fws_mtx_u, "fwsync mtx dynamic", NULL, MTX_DEF); mtx_init(&fws_mtx_e, "fwsync mtx edge", NULL, MTX_DEF); mtx_init(&fws_mtx_c, "fwsync mtx collector", NULL, MTX_DEF);