zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_main.c

diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index b8e6d8ad3db41d6da1d21e03992fa972b6021d2c..50ebc4003ec97554c26e31f2b83b39490c55bde9 100644 (file)
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -40,12 +40,14 @@
 #include "libfrr.h"
 
 #include "pimd.h"
+#include "pim_instance.h"
 #include "pim_version.h"
 #include "pim_signals.h"
 #include "pim_zebra.h"
 #include "pim_msdp.h"
 #include "pim_iface.h"
 #include "pim_bfd.h"
+#include "pim_errors.h"
 
 extern struct host host;
 
@@ -69,6 +71,10 @@ struct zebra_privs_t pimd_privs = {
        .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]),
        .cap_num_i = 0};
 
+static const struct frr_yang_module_info *pimd_yang_modules[] = {
+       &frr_interface_info,
+};
+
 FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT,
 
                .proghelp = "Implementation of the PIM routing protocol.",
@@ -76,7 +82,8 @@ FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT,
                .signals = pimd_signals,
                .n_signals = 4 /* XXX array_size(pimd_signals) XXX*/,
 
-               .privs = &pimd_privs, )
+               .privs = &pimd_privs, .yang_modules = pimd_yang_modules,
+               .n_yang_modules = array_size(pimd_yang_modules), )
 
 
 int main(int argc, char **argv, char **envp)
@@ -107,6 +114,7 @@ int main(int argc, char **argv, char **envp)
        /*
         * Initializations
         */
+       pim_error_init();
        pim_vrf_init();
        access_list_init();
        prefix_list_init();
@@ -115,7 +123,6 @@ int main(int argc, char **argv, char **envp)
 
        pim_route_map_init();
        pim_init();
-       pim_msdp_init(master);
 
        /*
         * Initialize zclient "update" and "lookup" sockets