--- fwsync/driver/fwsync.c	2022/07/11 15:59:42	1.5
+++ fwsync/driver/fwsync.c	2022/08/04 00:24:39	1.7
@@ -5,48 +5,6 @@
 #include "fwsync.h"
 
 
-static intptr_t fwsync_wchan;
-
-
-static int
-fwsync_add_state_4(const struct fws_proto *pkt)
-{
-	DTRACE();
-
-	return 0;
-}
-
-static int
-fwsync_add_state_6(const struct fws_proto *pkt)
-{
-	DTRACE();
-
-	return 0;
-}
-
-static int
-fwsync_add_state(const struct fws_proto *pkt)
-{
-	DTRACE();
-
-	if (pkt->fws_addrtype == 4)
-		fwsync_add_state_4(pkt);
-	else if (pkt->fws_addrtype == 6)
-		fwsync_add_state_6(pkt);
-	else
-		return EINVAL;
-
-	return 0;
-}
-
-static int
-fwsync_add_alias(const struct fws_proto *pkt)
-{
-	DTRACE();
-
-	return 0;
-}
-
 static void
 fwsync_edge_proc(void *arg)
 {
@@ -57,30 +15,29 @@ fwsync_edge_proc(void *arg)
 
 	DTRACE();
 
+	callout_schedule(&fws_co, hz);
+
 	memset(&uio, 0, sizeof uio);
 	uio.uio_resid = 1000000000;
 	uio.uio_td = curthread;
 
-	fws_ctx.config |= CTX_EDGE_ONLINE;
-	while ((fws_cfg.cfg.on & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_EDGE_READY)) {
-		if (m)
-			m_freem(m);
-		m = NULL;
+	if ((fws_cfg.cfg.on & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_EDGE_READY)) {
 		rcvflg = MSG_DONTWAIT;
 		e = soreceive(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], NULL, &uio, &m, NULL, &rcvflg);
 		if (e) {
 			if (e != EAGAIN)
 				printf("error in edge handler #%d\n", e);
-			tsleep(&fwsync_wchan, 0, "edge_handler", hz);
-			continue;
+			return;
 		}
 		pkt = mtod(m, struct fws_proto*);
 		if (m_length(m, NULL) != sizeof(struct fws_proto)) {
 			printf("FWSync packet length=%d isn't match expected %lu\n", 
 					m_length(m, NULL), sizeof(struct fws_proto));
-			continue;
+			return;
 		}
 
+		printf("%u...-> %s version=%c\n", m->m_len, m->m_data, pkt->fws_version);
+
 		switch (pkt->fws_version) {
 			case FWS_PKTVER_STATE:
 				fwsync_add_state(pkt);
@@ -90,14 +47,9 @@ fwsync_edge_proc(void *arg)
 				break;
 			default:
 				printf("FWSync packet was discarded due to wrong version\n");
-				continue;
+				return;
 		}
-
-		printf("%u...-> %s version=%c\n", m->m_len, m->m_data, pkt->fws_version);
 	}
-	fws_ctx.config &= ~CTX_EDGE_ONLINE;
-
-	kproc_exit(0);
 }
 
 int
@@ -214,9 +166,9 @@ fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader
 		fws_cfg.cfg.addrs = 0;
 		memset(fws_cfg.cfg_addr, 0, sizeof fws_cfg.cfg_addr[0]);
 
-		if (fws_ctx.config & CTX_EDGE_READY) {
+		if (fws_ctx.config & CTX_EDGE_ONLINE) {
+			callout_drain(&fws_co);
 			soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD);
-			tsleep(&fwsync_wchan, 0, "fwsedge_kill", 2 * hz);
 			soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]);
 		}
 	}
@@ -291,7 +243,7 @@ fwsync_list(struct ip_fw_chain *ch, ip_fw3_opheader *o
 int
 fwsync_start(struct ip_fw_chain *ch, ip_fw3_opheader *op3, struct sockopt_data *sd)
 {
-	int *n, e;
+	int *n;
 	ipfw_obj_header *oh;
 	size_t sz;
 
@@ -312,13 +264,9 @@ fwsync_start(struct ip_fw_chain *ch, ip_fw3_opheader *
 
 	if ((*n & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_EDGE_READY)) {
 		fws_cfg.cfg.on |= CFG_SYNC_EDGE;
+		fws_ctx.config |= CTX_EDGE_ONLINE;
 
-		e = kproc_create(fwsync_edge_proc, NULL, &fws_ctx.procz[CFG_SYNC_ADDR_EDGE], 
-				0, 0, "fwsync_edge");
-		if (e) {
-			printf("fwsync fwsync_edge failed #%d\n", e);
-			return e;
-		}
+		callout_reset(&fws_co, hz, fwsync_edge_proc, NULL);
 	}
 
 	if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_1_READY)) {
@@ -368,8 +316,12 @@ fwsync_stop(struct ip_fw_chain *ch, ip_fw3_opheader *o
 
 	n = (int*) (oh + 1);
 
-	if ((*n & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_CFG_EDGE))
+	if ((*n & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_CFG_EDGE)) {
 		fws_cfg.cfg.on &= ~CFG_SYNC_EDGE;
+		fws_ctx.config &= ~CTX_EDGE_ONLINE;
+
+		callout_drain(&fws_co);
+	}
 
 	if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE))
 		fws_ctx.config &= ~CTX_COLLECTOR_2_ONLINE;