--- fwsync/driver/fwsync_mod.c	2022/07/11 21:18:07	1.4
+++ fwsync/driver/fwsync_mod.c	2022/08/10 00:03:50	1.6
@@ -25,8 +25,9 @@ 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;
+fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt; 
 
 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 +50,21 @@ 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_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 +75,7 @@ fws_fini(void *arg)
 
 	mtx_destroy(&fws_mtx_c);
 	mtx_destroy(&fws_mtx_e);
+	mtx_destroy(&fws_mtx_u);
 
 	fwsync_hooked = 0;
 
@@ -94,14 +108,14 @@ fws_init(void *arg)
 	memset(&fws_ctx, 0, sizeof fws_ctx);
 
 	TAILQ_INIT(&fwsync_sndpkt);
+	TAILQ_INIT(&fwsync_updpkt);
 
 	/* mutexes */
+	mtx_init(&fws_mtx_u, "fwsync mtx update", 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 +124,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);