--- fwsync/driver/fwsync_workers.c	2022/06/22 13:01:55	1.1
+++ fwsync/driver/fwsync_workers.c	2022/06/29 19:44:58	1.2
@@ -5,15 +5,34 @@
 #include "fwsync.h"
 
 
-static void
-fwsync_sndpkt(void *context, int pending)
+void
+fwsync_sndpkt_state(void *context, int pending)
 {
-	struct mbuf *m2, *m = (struct mbuf*) context;
+	struct fws_sndpkt *pkt;
+	struct mbuf *m2, *m;
 	int e;
 
 	DTRACE();
 
-	if (fws_cfg.cfg.on & CFG_SYNC_COLLECTOR) {
+	printf("pending=%d\n", pending);
+
+	do {
+		mtx_lock(&fws_mtx_c);
+		pkt = TAILQ_FIRST(&fwsync_sndpkt);
+		TAILQ_REMOVE(&fwsync_sndpkt, pkt, sp_next);
+		mtx_unlock(&fws_mtx_c);
+
+		if (!(fws_cfg.cfg.on & CFG_SYNC_COLLECTOR))
+			continue;
+
+		m = m_gethdr(M_NOWAIT, MT_DATA);
+		if (!m)
+			continue;
+
+		memcpy(mtod(m, struct fws_proto *), &pkt->sp_proto, sizeof pkt->sp_proto);
+		m->m_len = sizeof pkt->sp_proto;
+		m_fixhdr(m);
+
 		if ((fws_ctx.config & (CTX_COLLECTOR_2_ONLINE | CTX_COLLECTOR_2_READY)) == 
 				(CTX_COLLECTOR_2_ONLINE | CTX_COLLECTOR_2_READY)) {
 			m2 = m_copypacket(m, M_NOWAIT);
@@ -24,7 +43,7 @@ fwsync_sndpkt(void *context, int pending)
 			e = sosend(fws_ctx.sockz[CFG_SYNC_ADDR_COLLECTOR_2], 
 					&fws_cfg.cfg_addr[CFG_SYNC_ADDR_COLLECTOR_2].addr, NULL, 
 					m2, NULL, 0, curthread);
-			if (e != EAGAIN)
+			if (e && e != EAGAIN)
 				printf("error in collector %d handler #%d\n", CFG_SYNC_ADDR_COLLECTOR_2, e);
 		}
 
@@ -38,36 +57,35 @@ fwsync_sndpkt(void *context, int pending)
 			e = sosend(fws_ctx.sockz[CFG_SYNC_ADDR_COLLECTOR_1], 
 					&fws_cfg.cfg_addr[CFG_SYNC_ADDR_COLLECTOR_1].addr, NULL, 
 					m2, NULL, 0, curthread);
-			if (e != EAGAIN)
+			if (e && e != EAGAIN)
 				printf("error in collector %d handler #%d\n", CFG_SYNC_ADDR_COLLECTOR_1, e);
 		}
-	}
 out:
-	m_freem(m);
-
+		m_freem(m);
+	} while (--pending);
 }
 
 int
-fwsync_state_handler(const void *arg)
+fwsync_state_handler(void *arg)
 {
-	const struct ipfw_flow_id *pkt = arg;
+	struct ipfw_flow_id *pkt = arg;
 	struct fws_proto *spkt;
-	struct mbuf *m;
+	struct fws_sndpkt *p;
 
 	DTRACE();
 
 	if (pkt->addr_type == 1)
 		return 0;	/* skip ethernet packet */
 
-	m = m_gethdr(M_WAITOK, MT_DATA);
-	if (!m)
-		return ENOMEM;
-	else {
-		spkt = mtod(m, struct fws_proto *);
-		m->m_len = sizeof(struct fws_proto);
-		m_fixhdr(m);
-	}
+	mtx_lock(&fws_mtx_c);
 
+	p = malloc(sizeof(struct fws_proto), M_FWSYNC, M_NOWAIT | M_ZERO);
+	if (!p) {
+		mtx_unlock(&fws_mtx_c);
+		return 0;
+	} else
+		spkt = &p->sp_proto;
+
 	spkt->fws_version = FWS_PKTVER_STATE;
 	spkt->fws_fib = pkt->fib;
 	spkt->fws_proto = pkt->proto;
@@ -87,17 +105,21 @@ fwsync_state_handler(const void *arg)
 			spkt->fws_scopeid = pkt->flow_id6;
 			break;
 		default:
-			m_free(m);
-			return 0;
+			free(p, M_FWSYNC);
+			mtx_unlock(&fws_mtx_c);
+			return EINVAL;
 	}
 
-	TASK_INIT(&fws_sndpkt_task, 0, fwsync_sndpkt, m);
-	taskqueue_enqueue(taskqueue_thread, &fws_sndpkt_task);
+	TAILQ_INSERT_TAIL(&fwsync_sndpkt, p, sp_next);
+
+	mtx_unlock(&fws_mtx_c);
+
+	taskqueue_enqueue(fws_tq, &fws_sndpkt_task);
 	return 0;
 }
 
 int
-fwsync_alias_handler(const void *arg)
+fwsync_alias_handler(void *arg)
 {
 	DTRACE();