--- fwsync/driver/fwsync_mod.c	2022/07/11 21:18:07	1.4
+++ fwsync/driver/fwsync_mod.c	2022/08/26 13:33:43	1.8.2.1
@@ -1,7 +1,29 @@
-/*************************************************************************
-* (C) 2022 CloudSigma AG - Sofia/Bulgaria
-*  by Michael Pounov <misho@elwix.org>
-**************************************************************************/
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2022 Michael Pounov <misho@elwix.org>, CloudSigma AG
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 #include "fwsync.h"
 
 
@@ -25,8 +47,10 @@ struct cfg_sync fws_cfg;
 
 struct task fws_sndpkt_task;
 struct taskqueue *fws_tq;
-struct mtx fws_mtx_c, fws_mtx_e;
-fwsync_sndpkt_t fwsync_sndpkt; 
+struct callout fws_co;
+struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u, fws_mtx_n;
+fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt, fwsync_natpkt; 
+struct fws_acct fws_acct;
 
 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");
@@ -49,9 +73,29 @@ fws_fini(void *arg)
 
 	IPFW_DEL_SOPT_HANDLER(1, soc);
 
-	if (fws_tq)
+	callout_drain(&fws_co);
+
+	if (fws_tq) {
+		taskqueue_drain_all(fws_tq);
 		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);
+		TAILQ_REMOVE(&fwsync_updpkt, p, sp_next);
+		free(p, M_FWSYNC);
+	}
+	mtx_unlock(&fws_mtx_u);
+
 	mtx_lock(&fws_mtx_c);
 	while (!TAILQ_EMPTY(&fwsync_sndpkt)) {
 		p = TAILQ_FIRST(&fwsync_sndpkt);
@@ -62,6 +106,8 @@ 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;
 
@@ -92,16 +138,19 @@ fws_init(void *arg)
 
 	memset(&fws_cfg, 0, sizeof fws_cfg);
 	memset(&fws_ctx, 0, sizeof fws_ctx);
+	memset(&fws_acct, 0, sizeof fws_acct);
 
 	TAILQ_INIT(&fwsync_sndpkt);
+	TAILQ_INIT(&fwsync_updpkt);
+	TAILQ_INIT(&fwsync_natpkt);
 
 	/* mutexes */
+	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);
 
 	/* taskqueue */
-	TASK_INIT(&fws_sndpkt_task, 0, fwsync_sndpkt_handler, &fwsync_sndpkt);
-
 	fws_tq = taskqueue_create("fwsync_tq", M_NOWAIT, taskqueue_thread_enqueue, &fws_tq);
 	if (!fws_tq) {
 		printf("Failed to allocate fwsync task queue\n");
@@ -110,6 +159,12 @@ fws_init(void *arg)
 		return ENOMEM;
 	} else
 		taskqueue_start_threads(&fws_tq, 1, PI_NET, "fwsync tq");
+
+	TASK_INIT(&fws_sndpkt_task, 0, fwsync_sndpkt_handler, &fwsync_sndpkt);
+
+	/* callout */
+
+	callout_init_mtx(&fws_co, &fws_mtx_e, 0);
 
 	/* sysctl context */
 	sysctl_ctx_init(&fwsync_sysctl_ctx);