Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / libfrr.h

diff --git a/lib/libfrr.h b/lib/libfrr.h
index 3dc5d7af81db4c30fb4c04bfc53c4757cadfa3b6..97e9b93c101e45f776111432a237235a542967a2 100644 (file)
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -1,26 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * libfrr overall management functions
  *
  * Copyright (C) 2016  David Lamparter for NetDEF, Inc.
- *
- * 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_FRR_H
 #define _ZEBRA_FRR_H
 
+#include "typesafe.h"
 #include "sigevent.h"
 #include "privs.h"
 #include "thread.h"
@@ -40,15 +28,25 @@ extern "C" {
 #define FRR_NO_PRIVSEP         (1 << 0)
 #define FRR_NO_TCPVTY          (1 << 1)
 #define FRR_LIMITED_CLI                (1 << 2)
-#define FRR_NO_CFG_PID_DRY     (1 << 3)
-#define FRR_NO_ZCLIENT         (1 << 4)
+#define FRR_NO_SPLIT_CONFIG    (1 << 3)
+#define FRR_NO_PID             (1 << 4)
+#define FRR_NO_CFG_PID_DRY     (FRR_NO_PID | FRR_NO_SPLIT_CONFIG)
+#define FRR_NO_ZCLIENT         (1 << 5)
 /* If FRR_DETACH_LATER is used, the daemon will keep its parent running
  * until frr_detach() is called.  Normally "somedaemon -d" returns once the
  * main event loop is reached in the daemon;  use this for extra startup bits.
  *
  * Does nothing if -d isn't used.
  */
-#define FRR_DETACH_LATER       (1 << 5)
+#define FRR_DETACH_LATER       (1 << 6)
+
+PREDECL_DLIST(log_args);
+struct log_arg {
+       struct log_args_item itm;
+
+       char target[0];
+};
+DECLARE_DLIST(log_args, struct log_arg, itm);
 
 enum frr_cli_mode {
        FRR_CLI_CLASSIC = 0,
@@ -86,7 +84,7 @@ struct frr_daemon_info {
        const char *pathspace;
        bool zpathspace;
 
-       const char *early_logging;
+       struct log_args_head early_logging[1];
        const char *early_loglevel;
 
        const char *proghelp;
@@ -94,7 +92,7 @@ struct frr_daemon_info {
        const char *copyright;
        char startinfo[128];
 
-       struct quagga_signal_t *signals;
+       struct frr_signal_t *signals;
        size_t n_signals;
 
        struct zebra_privs_t *privs;
@@ -142,6 +140,7 @@ extern uint32_t frr_get_fd_limit(void);
 extern bool frr_is_startup_fd(int fd);
 
 /* call order of these hooks is as ordered here */
+DECLARE_HOOK(frr_early_init, (struct thread_master * tm), (tm));
 DECLARE_HOOK(frr_late_init, (struct thread_master * tm), (tm));
 /* fork() happens between late_init and config_pre */
 DECLARE_HOOK(frr_config_pre, (struct thread_master * tm), (tm));