--- fwsync/driver/fwsync_workers.c 2022/08/11 21:59:05 1.10 +++ fwsync/driver/fwsync_workers.c 2022/08/18 12:34:00 1.15 @@ -31,8 +31,22 @@ fwsync_add_state(const struct fws_proto *pkt) int fwsync_add_alias(const struct fws_proto *pkt) { + struct fws_sndpkt *p; + DTRACE(); + if (!pkt || pkt->fws_addrtype == 1) + return 0; /* skip ethernet packet */ + + p = malloc(sizeof(struct fws_sndpkt), M_FWSYNC, M_NOWAIT | M_ZERO); + if (!p) { + return ENOMEM; + } else + memcpy(&p->sp_proto, pkt, sizeof(struct fws_proto)); + + mtx_lock(&fws_mtx_n); + TAILQ_INSERT_TAIL(&fwsync_natpkt, p, sp_next); + mtx_unlock(&fws_mtx_n); return 0; } @@ -254,6 +268,40 @@ fwsync_state_sync(const void *arg, const void *extdata ipfw_dyn_install_sync_state(&fid, rule, pkt->sp_proto.fws_ruleid, pkt->sp_proto.fws_rulenum, pkt->sp_proto.fws_kidx, pkt->sp_proto.fws_cmdtype); + + free(pkt, M_FWSYNC); + return 0; +} + +int +fwsync_alias_sync(const void *arg, const void *extdata) +{ + struct fws_sndpkt *pkt; + const struct cfg_nat *t = arg; + + DTRACE(); + + mtx_lock(&fws_mtx_n); + pkt = TAILQ_FIRST(&fwsync_natpkt); + if (pkt) + TAILQ_REMOVE(&fwsync_natpkt, pkt, sp_next); + mtx_unlock(&fws_mtx_n); + + if (!pkt) /* update queue is empty */ + return 0; + + if (!(fws_cfg.cfg.on & CFG_SYNC_EDGE)) { + free(pkt, M_FWSYNC); + return EAGAIN; + } + + printf("%s: pkt=%p t=%p\n", __func__, pkt, t->if_name); + + 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;