--- fwsync/driver/fwsync_workers.c 2022/08/13 18:44:02 1.13 +++ fwsync/driver/fwsync_workers.c 2022/08/19 09:37:33 1.18 @@ -1,7 +1,29 @@ -/************************************************************************* -* (C) 2022 CloudSigma AG - Sofia/Bulgaria -* by Michael Pounov -**************************************************************************/ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Michael Pounov , CloudSigma AG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #include "fwsync.h" @@ -35,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) { @@ -277,26 +299,34 @@ 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) + while ((pkt = TAILQ_FIRST(&fwsync_natpkt))) { 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); + 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); - // TODO: xxx - printf("%s: pkt=%p\n", __func__, pkt); - - free(pkt, M_FWSYNC); return 0; }