--- fwsync/driver/fwsync.c 2022/07/11 15:59:42 1.5 +++ fwsync/driver/fwsync.c 2022/08/26 13:33:43 1.12.2.1 @@ -1,52 +1,32 @@ -/************************************************************************* -* (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" -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,28 +37,26 @@ 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; + m_freem(m); + return; } switch (pkt->fws_version) { @@ -90,14 +68,11 @@ fwsync_edge_proc(void *arg) break; default: printf("FWSync packet was discarded due to wrong version\n"); - continue; + break; } - printf("%u...-> %s version=%c\n", m->m_len, m->m_data, pkt->fws_version); + m_freem(m); } - fws_ctx.config &= ~CTX_EDGE_ONLINE; - - kproc_exit(0); } int @@ -209,16 +184,20 @@ fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader n = (int*) (oh + 1); if (*n & CFG_SYNC_EDGE) { + if (fws_ctx.config & CTX_EDGE_ONLINE) { + ipfw_unregister_state_sync(); + ipfw_unregister_alias_sync(); + } + + callout_drain(&fws_co); + fws_cfg.cfg.on &= ~CFG_SYNC_EDGE; fws_cfg.cfg.edge = 0; fws_cfg.cfg.addrs = 0; memset(fws_cfg.cfg_addr, 0, sizeof fws_cfg.cfg_addr[0]); - if (fws_ctx.config & CTX_EDGE_READY) { - 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]); - } + soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD); + soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]); } if (*n & CFG_SYNC_COLLECTOR) { if (fws_ctx.config & (CTX_COLLECTOR_1_ONLINE | CTX_COLLECTOR_2_ONLINE)) { @@ -226,6 +205,8 @@ fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader ipfw_unregister_alias_hook(); } + taskqueue_drain(fws_tq, &fws_sndpkt_task); + fws_cfg.cfg.on &= ~CFG_SYNC_COLLECTOR; fws_cfg.cfg.collector = 0; fws_cfg.cfg.addrs = 0; @@ -239,6 +220,8 @@ fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader fws_ctx.config ^= fws_ctx.config; + memset(&fws_acct, 0, sizeof fws_acct); + return 0; } @@ -291,7 +274,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; @@ -313,12 +296,14 @@ 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; - 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 (!(fws_ctx.config & CTX_EDGE_ONLINE)) { + ipfw_register_state_sync(fwsync_state_sync); + ipfw_register_alias_sync(fwsync_alias_sync); } + + fws_ctx.config |= CTX_EDGE_ONLINE; } if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_1_READY)) { @@ -368,9 +353,16 @@ 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); + + ipfw_unregister_state_sync(); + ipfw_unregister_alias_sync(); + } + if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE)) fws_ctx.config &= ~CTX_COLLECTOR_2_ONLINE; if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_1_ONLINE)) @@ -382,6 +374,8 @@ fwsync_stop(struct ip_fw_chain *ch, ip_fw3_opheader *o ipfw_unregister_state_hook(); ipfw_unregister_alias_hook(); + + taskqueue_drain(fws_tq, &fws_sndpkt_task); } return 0;