Merge pull request #5805 from donaldsharp/babel_int_return

[mirror_frr.git] / pimd / pim_main.c

diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index dc42899c7b924c6288e95d3a8832c4098101a0e2..f0ca367258d4ab5840b8bf6e9316136bb5b721f1 100644 (file)
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -29,7 +29,6 @@
 
 #include "memory.h"
 #include "vrf.h"
-#include "memory_vty.h"
 #include "filter.h"
 #include "vty.h"
 #include "sigevent.h"
@@ -47,6 +46,7 @@
 #include "pim_msdp.h"
 #include "pim_iface.h"
 #include "pim_bfd.h"
+#include "pim_mlag.h"
 #include "pim_errors.h"
 
 extern struct host host;
@@ -68,10 +68,10 @@ struct zebra_privs_t pimd_privs = {
        .vty_group = VTY_GROUP,
 #endif
        .caps_p = _caps_p,
-       .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]),
+       .cap_num_p = array_size(_caps_p),
        .cap_num_i = 0};
 
-static const struct frr_yang_module_info *pimd_yang_modules[] = {
+static const struct frr_yang_module_info *const pimd_yang_modules[] = {
        &frr_interface_info,
 };
 
@@ -127,8 +127,11 @@ int main(int argc, char **argv, char **envp)
        /*
         * Initialize zclient "update" and "lookup" sockets
         */
+       if_zapi_callbacks(pim_ifp_create, pim_ifp_up,
+                         pim_ifp_down, pim_ifp_destroy);
        pim_zebra_init();
        pim_bfd_init();
+       pim_mlag_init();
 
        frr_config_fork();