[BACK]Return to fwsync_mod.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / fwsync / driver

Diff for /fwsync/driver/fwsync_mod.c between versions 1.6 and 1.9

version 1.6, 2022/08/10 00:03:50 version 1.9, 2022/08/26 14:47:36
Line 1 Line 1
/*************************************************************************/*-
* (C) 2022 CloudSigma AG - Sofia/Bulgaria * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*  by Michael Pounov <misho@elwix.org> *
**************************************************************************/ * Copyright (c) 2022 Michael Pounov <misho@elwix.org>, 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"  #include "fwsync.h"
   
   
Line 26  struct cfg_sync fws_cfg; Line 48  struct cfg_sync fws_cfg;
 struct task fws_sndpkt_task;  struct task fws_sndpkt_task;
 struct taskqueue *fws_tq;  struct taskqueue *fws_tq;
 struct callout fws_co;  struct callout fws_co;
struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u;struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u, fws_mtx_n;
fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt; fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt, fwsync_natpkt; 
 struct fws_acct fws_acct;
   
 SYSCTL_NODE(_net_inet_ip, IFT_FWSYNC, fwsync, CTLFLAG_RW, 0, "IPFW Sync - Sync firewall states");  SYSCTL_NODE(_net_inet_ip, IFT_FWSYNC, fwsync, CTLFLAG_RW, 0, "IPFW Sync - Sync firewall states");
 SYSCTL_INT(_net_inet_ip_fwsync, OID_AUTO, debug, CTLFLAG_RW, &fwsync_debug, 0, "Debug driver");  SYSCTL_INT(_net_inet_ip_fwsync, OID_AUTO, debug, CTLFLAG_RW, &fwsync_debug, 0, "Debug driver");
   SYSCTL_NODE(_net_inet_ip_fwsync, IFT_FWSYNC_ACCT, acct, CTLFLAG_RD, 0, "IPFW Sync - Handled states");
   SYSCTL_ULONG(_net_inet_ip_fwsync_acct, OID_AUTO, collector_states, CTLFLAG_RD, &fws_acct.states[0], 0, "Sent states to network");
   SYSCTL_ULONG(_net_inet_ip_fwsync_acct, OID_AUTO, edge_states, CTLFLAG_RD, &fws_acct.states[1], 0, "Received states from network");
   SYSCTL_ULONG(_net_inet_ip_fwsync_acct, OID_AUTO, collector_aliases, CTLFLAG_RD, &fws_acct.aliases[0], 0, "Sent aliases to network");
   SYSCTL_ULONG(_net_inet_ip_fwsync_acct, OID_AUTO, edge_aliases, CTLFLAG_RD, &fws_acct.aliases[1], 0, "Received aliases from network");
   
 static int  static int
 fws_fini(void *arg)  fws_fini(void *arg)
Line 57  fws_fini(void *arg) Line 85  fws_fini(void *arg)
                 taskqueue_free(fws_tq);                  taskqueue_free(fws_tq);
         }          }
   
           mtx_lock(&fws_mtx_n);
           while (!TAILQ_EMPTY(&fwsync_natpkt)) {
                   p = TAILQ_FIRST(&fwsync_natpkt);
                   TAILQ_REMOVE(&fwsync_natpkt, p, sp_next);
                   free(p, M_FWSYNC);
           }
           mtx_unlock(&fws_mtx_n);
   
         mtx_lock(&fws_mtx_u);          mtx_lock(&fws_mtx_u);
         while (!TAILQ_EMPTY(&fwsync_updpkt)) {          while (!TAILQ_EMPTY(&fwsync_updpkt)) {
                 p = TAILQ_FIRST(&fwsync_updpkt);                  p = TAILQ_FIRST(&fwsync_updpkt);
Line 76  fws_fini(void *arg) Line 112  fws_fini(void *arg)
         mtx_destroy(&fws_mtx_c);          mtx_destroy(&fws_mtx_c);
         mtx_destroy(&fws_mtx_e);          mtx_destroy(&fws_mtx_e);
         mtx_destroy(&fws_mtx_u);          mtx_destroy(&fws_mtx_u);
           mtx_destroy(&fws_mtx_n);
   
         fwsync_hooked = 0;          fwsync_hooked = 0;
   
Line 106  fws_init(void *arg) Line 143  fws_init(void *arg)
   
         memset(&fws_cfg, 0, sizeof fws_cfg);          memset(&fws_cfg, 0, sizeof fws_cfg);
         memset(&fws_ctx, 0, sizeof fws_ctx);          memset(&fws_ctx, 0, sizeof fws_ctx);
           memset(&fws_acct, 0, sizeof fws_acct);
   
         TAILQ_INIT(&fwsync_sndpkt);          TAILQ_INIT(&fwsync_sndpkt);
         TAILQ_INIT(&fwsync_updpkt);          TAILQ_INIT(&fwsync_updpkt);
           TAILQ_INIT(&fwsync_natpkt);
   
         /* mutexes */          /* mutexes */
        mtx_init(&fws_mtx_u, "fwsync mtx update", NULL, MTX_DEF);        mtx_init(&fws_mtx_n, "fwsync mtx alias", NULL, MTX_DEF);
         mtx_init(&fws_mtx_u, "fwsync mtx dynamic", NULL, MTX_DEF);
         mtx_init(&fws_mtx_e, "fwsync mtx edge", NULL, MTX_DEF);          mtx_init(&fws_mtx_e, "fwsync mtx edge", NULL, MTX_DEF);
         mtx_init(&fws_mtx_c, "fwsync mtx collector", NULL, MTX_DEF);          mtx_init(&fws_mtx_c, "fwsync mtx collector", NULL, MTX_DEF);
   
Removed from v.1.6  
changed lines
  Added in v.1.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>