Diff for /fwsync/driver/fwsync.c between versions 1.8 and 1.11

version 1.8, 2022/08/10 00:03:49 version 1.11, 2022/08/18 13:02:13
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 37  fwsync_edge_proc(void *arg) Line 59  fwsync_edge_proc(void *arg)
                         return;                          return;
                 }                  }
   
                 printf("%u...-> %s version=%c\n", m->m_len, m->m_data, pkt->fws_version);  
   
                 switch (pkt->fws_version) {                  switch (pkt->fws_version) {
                         case FWS_PKTVER_STATE:                          case FWS_PKTVER_STATE:
                                 fwsync_add_state(pkt);                                  fwsync_add_state(pkt);
Line 172  fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader Line 192  fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader
                 if (fws_ctx.config & CTX_EDGE_ONLINE) {                  if (fws_ctx.config & CTX_EDGE_ONLINE) {
                         callout_drain(&fws_co);                          callout_drain(&fws_co);
                         ipfw_unregister_state_sync();                          ipfw_unregister_state_sync();
                           ipfw_unregister_alias_sync();
                         soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD);                          soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD);
                         soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]);                          soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]);
                 }                  }
Line 273  fwsync_start(struct ip_fw_chain *ch, ip_fw3_opheader * Line 294  fwsync_start(struct ip_fw_chain *ch, ip_fw3_opheader *
   
                 callout_reset(&fws_co, hz, fwsync_edge_proc, NULL);                  callout_reset(&fws_co, hz, fwsync_edge_proc, NULL);
   
                if (!(fws_ctx.config & CTX_EDGE_ONLINE))                if (!(fws_ctx.config & CTX_EDGE_ONLINE)) {
                         ipfw_register_state_sync(fwsync_state_sync);                          ipfw_register_state_sync(fwsync_state_sync);
                           ipfw_register_alias_sync(fwsync_alias_sync);
                   }
   
                 fws_ctx.config |= CTX_EDGE_ONLINE;                  fws_ctx.config |= CTX_EDGE_ONLINE;
         }          }
Line 333  fwsync_stop(struct ip_fw_chain *ch, ip_fw3_opheader *o Line 356  fwsync_stop(struct ip_fw_chain *ch, ip_fw3_opheader *o
                 callout_drain(&fws_co);                  callout_drain(&fws_co);
   
                 ipfw_unregister_state_sync();                  ipfw_unregister_state_sync();
                   ipfw_unregister_alias_sync();
         }          }
   
         if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE))          if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE))

Removed from v.1.8  
changed lines
  Added in v.1.11


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