--- fwsync/driver/fwsync_workers.c	2022/08/18 13:42:37	1.17
+++ fwsync/driver/fwsync_workers.c	2022/08/27 14:29:12	1.19.2.1
@@ -57,8 +57,8 @@ fwsync_add_alias(const struct fws_proto *pkt)
 
 	DTRACE();
 
-	if (!pkt || pkt->fws_addrtype == 1)
-		return 0;	/* skip ethernet packet */
+	if (!pkt || pkt->fws_addrtype == 1 || pkt->fws_addrtype == 6)
+		return 0;	/* skip packet */
 
 	p = malloc(sizeof(struct fws_sndpkt), M_FWSYNC, M_NOWAIT | M_ZERO);
 	if (!p) {
@@ -117,7 +117,7 @@ fwsync_sndpkt_handler(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 && e != EAGAIN)
+			if (e && e != EAGAIN && e != EACCES)
 				printf("error in collector %d handler #%d\n", CFG_SYNC_ADDR_COLLECTOR_2, e);
 		}
 
@@ -131,7 +131,7 @@ fwsync_sndpkt_handler(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 && e != EAGAIN)
+			if (e && e != EAGAIN && e != EACCES)
 				printf("error in collector %d handler #%d\n", CFG_SYNC_ADDR_COLLECTOR_1, e);
 		}
 out:
@@ -192,6 +192,8 @@ fwsync_state_handler(const void *arg, const void *extd
 
 	TAILQ_INSERT_TAIL(&fwsync_sndpkt, p, sp_next);
 
+	fws_acct.states[0]++;
+
 	mtx_unlock(&fws_mtx_c);
 
 	taskqueue_enqueue(fws_tq, &fws_sndpkt_task);
@@ -233,6 +235,8 @@ fwsync_alias_handler(const void *arg, const void *extd
 
 	TAILQ_INSERT_TAIL(&fwsync_sndpkt, p, sp_next);
 
+	fws_acct.aliases[0]++;
+
 	mtx_unlock(&fws_mtx_c);
 
 	taskqueue_enqueue(fws_tq, &fws_sndpkt_task);
@@ -252,8 +256,10 @@ fwsync_state_sync(const void *arg, const void *extdata
 
 	mtx_lock(&fws_mtx_u);
 	pkt = TAILQ_FIRST(&fwsync_updpkt);
-	if (pkt)
+	if (pkt) {
 		TAILQ_REMOVE(&fwsync_updpkt, pkt, sp_next);
+		fws_acct.states[1]++;
+	}
 	mtx_unlock(&fws_mtx_u);
 
 	if (!pkt)	/* update queue is empty */
@@ -304,25 +310,30 @@ fwsync_alias_sync(const void *arg, const void *extdata
 	DTRACE();
 
 	mtx_lock(&fws_mtx_n);
-	pkt = TAILQ_FIRST(&fwsync_natpkt);
-	if (pkt)
+	while ((pkt = TAILQ_FIRST(&fwsync_natpkt))) {
 		TAILQ_REMOVE(&fwsync_natpkt, pkt, sp_next);
-	mtx_unlock(&fws_mtx_n);
+		fws_acct.aliases[1]++;
 
-	if (!pkt)	/* update queue is empty */
-		return 0;
+		if (!(fws_cfg.cfg.on & CFG_SYNC_EDGE)) {
+			free(pkt, M_FWSYNC);
+			continue;
+		}
 
-	if (!(fws_cfg.cfg.on & CFG_SYNC_EDGE)) {
+		if (t) {
+			LIBALIAS_LOCK(t->lib);
+			AddLink(t->lib, pkt->sp_proto.fws_saddr, 
+					pkt->sp_proto.fws_daddr, 
+					pkt->sp_proto.fws_aaddr, 
+					pkt->sp_proto.fws_sport, 
+					pkt->sp_proto.fws_dport, 
+					pkt->sp_proto.fws_aport, 
+					pkt->sp_proto.fws_linktype | LINK_SYNC_MASK);
+			LIBALIAS_UNLOCK(t->lib);
+		}
+
 		free(pkt, M_FWSYNC);
-		return EAGAIN;
 	}
+	mtx_unlock(&fws_mtx_n);
 
-	LIBALIAS_LOCK(t->lib);
-	AddLink(t->lib, pkt->sp_proto.fws_saddr, pkt->sp_proto.fws_daddr, pkt->sp_proto.fws_aaddr, 
-			pkt->sp_proto.fws_sport, pkt->sp_proto.fws_dport, pkt->sp_proto.fws_aport, 
-			pkt->sp_proto.fws_linktype | LINK_SYNC_MASK);
-	LIBALIAS_UNLOCK(t->lib);
-
-	free(pkt, M_FWSYNC);
 	return 0;
 }