Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / zebra / zserv.h

diff --git a/zebra/zserv.h b/zebra/zserv.h
index 7a5be001be3e42c31129961d1a754aad127f317d..1226cd7115b2a20ca8f360d544eb5cdc053a263f 100644 (file)
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Zebra API server.
  * Portions:
  *   Copyright (C) 1997-1999  Kunihiro Ishiguro
  *   Copyright (C) 2015-2018  Cumulus Networks, Inc.
  *   et al.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_ZSERV_H
@@ -36,14 +23,14 @@
 #include "lib/linklist.h"     /* for list */
 #include "lib/workqueue.h"    /* for work_queue */
 #include "lib/hook.h"         /* for DECLARE_HOOK, DECLARE_KOOH */
-
-#include "zebra/zebra_vrf.h"  /* for zebra_vrf */
 /* clang-format on */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct zebra_vrf;
+
 /* Default port information. */
 #define ZEBRA_VTY_PORT                2601
 
@@ -215,16 +202,21 @@ struct zserv {
         * relative to last_read_time.
         */
 
+       pthread_mutex_t stats_mtx;
+       /* BEGIN covered by stats_mtx */
+
        /* monotime of client creation */
-       _Atomic uint32_t connect_time;
+       uint64_t connect_time;
        /* monotime of last message received */
-       _Atomic uint32_t last_read_time;
+       uint64_t last_read_time;
        /* monotime of last message sent */
-       _Atomic uint32_t last_write_time;
+       uint64_t last_write_time;
        /* command code of last message read */
-       _Atomic uint32_t last_read_cmd;
+       uint64_t last_read_cmd;
        /* command code of last message written */
-       _Atomic uint32_t last_write_cmd;
+       uint64_t last_write_cmd;
+
+       /* END covered by stats_mtx */
 
        /*
         * Number of instances configured with
@@ -363,6 +355,13 @@ extern void zserv_release_client(struct zserv *client);
  */
 extern void zserv_close_client(struct zserv *client);
 
+/*
+ * Free memory for a zserv client object - note that this does not
+ * clean up the internal allocations associated with the zserv client,
+ * this just free the struct's memory.
+ */
+void zserv_client_delete(struct zserv *client);
+
 /*
  * Log a ZAPI message hexdump.
  *