--- fwsync/driver/fwsync_workers.c 2022/07/11 12:58:58 1.3 +++ fwsync/driver/fwsync_workers.c 2022/07/11 15:59:42 1.4 @@ -19,15 +19,23 @@ fwsync_sndpkt_handler(void *context, int pending) do { mtx_lock(&fws_mtx_c); pkt = TAILQ_FIRST(&fwsync_sndpkt); - TAILQ_REMOVE(&fwsync_sndpkt, pkt, sp_next); + if (pkt) + TAILQ_REMOVE(&fwsync_sndpkt, pkt, sp_next); mtx_unlock(&fws_mtx_c); - if (!(fws_cfg.cfg.on & CFG_SYNC_COLLECTOR)) + if (!pkt) /* sending queue is empty */ + break; + + if (!(fws_cfg.cfg.on & CFG_SYNC_COLLECTOR)) { + free(pkt, M_FWSYNC); continue; + } m = m_gethdr(M_NOWAIT, MT_DATA); - if (!m) + if (!m) { + free(pkt, M_FWSYNC); continue; + } memcpy(mtod(m, struct fws_proto *), &pkt->sp_proto, sizeof pkt->sp_proto); m->m_len = sizeof pkt->sp_proto; @@ -62,19 +70,20 @@ fwsync_sndpkt_handler(void *context, int pending) } out: m_freem(m); + free(pkt, M_FWSYNC); } while (--pending); } int -fwsync_state_handler(void *arg) +fwsync_state_handler(const void *arg) { - struct ipfw_flow_id *pkt = arg; + const struct ipfw_flow_id *pkt = arg; struct fws_proto *spkt; struct fws_sndpkt *p; DTRACE(); - if (pkt->addr_type == 1) + if (!pkt || pkt->addr_type == 1) return 0; /* skip ethernet packet */ mtx_lock(&fws_mtx_c); @@ -119,9 +128,42 @@ fwsync_state_handler(void *arg) } int -fwsync_alias_handler(void *arg) +fwsync_alias_handler(const void *arg) { + const struct alias_link *lnk = arg; + struct fws_proto *spkt; + struct fws_sndpkt *p; + DTRACE(); + if (!lnk || lnk->link_type >= IPPROTO_MAX) + return 0; + + 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_ALIAS; + spkt->fws_proto = lnk->link_type; + spkt->fws_addrtype = 4; + spkt->fws_sport = lnk->src_port; + spkt->fws_dport = lnk->dst_port; + spkt->fws_aport = lnk->alias_port; + spkt->fws_pport = lnk->proxy_port; + spkt->fws_saddr.s_addr = lnk->src_addr.s_addr; + spkt->fws_daddr.s_addr = lnk->dst_addr.s_addr; + spkt->fws_aaddr.s_addr = lnk->alias_addr.s_addr; + spkt->fws_paddr.s_addr = lnk->proxy_addr.s_addr; + + TAILQ_INSERT_TAIL(&fwsync_sndpkt, p, sp_next); + + mtx_unlock(&fws_mtx_c); + + taskqueue_enqueue(fws_tq, &fws_sndpkt_task); return 0; }