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 a80059535d1a7e387fe2bdc9697ba93eaea3b28b..50ebc4003ec97554c26e31f2b83b39490c55bde9 100644 (file)
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -20,7 +20,7 @@
 #include <zebra.h>
 
 #include "log.h"
-#include "privs.h" 
+#include "privs.h"
 #include "version.h"
 #include <getopt.h>
 #include "command.h"
@@ -40,124 +40,125 @@
 #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;
 
-struct option longopts[] = {
-  { 0 }
-};
+struct option longopts[] = {{0}};
 
 /* pimd privileges */
-zebra_capabilities_t _caps_p [] = 
-{
-  ZCAP_NET_ADMIN,
-  ZCAP_SYS_ADMIN,
-  ZCAP_NET_RAW,
-  ZCAP_BIND,
+zebra_capabilities_t _caps_p[] = {
+       ZCAP_NET_ADMIN, ZCAP_SYS_ADMIN, ZCAP_NET_RAW, ZCAP_BIND,
 };
 
 /* pimd privileges to run with */
-struct zebra_privs_t pimd_privs =
-{
+struct zebra_privs_t pimd_privs = {
 #if defined(FRR_USER) && defined(FRR_GROUP)
-  .user = FRR_USER,
-  .group = FRR_GROUP,
+       .user = FRR_USER,
+       .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+       .vty_group = VTY_GROUP,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
-  .cap_num_i = 0
-};
-
-FRR_DAEMON_INFO(pimd, PIM,
-       .vty_port = PIMD_VTY_PORT,
-
-       .proghelp = "Implementation of the PIM routing protocol.",
-
-       .signals = pimd_signals,
-       .n_signals = 4 /* XXX array_size(pimd_signals) XXX*/,
+       .caps_p = _caps_p,
+       .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]),
+       .cap_num_i = 0};
 
-       .privs = &pimd_privs,
-)
-
-
-int main(int argc, char** argv, char** envp) {
-  frr_preinit(&pimd_di, argc, argv);
-  frr_opt_add("", longopts, "");
-
-  /* this while just reads the options */
-  while (1) {
-    int opt;
-
-    opt = frr_getopt(argc, argv, NULL);
+static const struct frr_yang_module_info *pimd_yang_modules[] = {
+       &frr_interface_info,
+};
 
-    if (opt == EOF)
-      break;
-    
-    switch (opt) {
-    case 0:
-      break;
-    default:
-      frr_help_exit (1);
-      break;
-    }
-  }
+FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT,
 
-  master = frr_init();
+               .proghelp = "Implementation of the PIM routing protocol.",
 
-  /* 
-   * Initializations
-   */
-  pim_vrf_init ();
-  access_list_init();
-  prefix_list_init ();
-  prefix_list_add_hook (pim_prefix_list_update);
-  prefix_list_delete_hook (pim_prefix_list_update);
+               .signals = pimd_signals,
+               .n_signals = 4 /* XXX array_size(pimd_signals) XXX*/,
 
-  pim_route_map_init ();
-  pim_init();
-  pim_msdp_init (master);
+               .privs = &pimd_privs, .yang_modules = pimd_yang_modules,
+               .n_yang_modules = array_size(pimd_yang_modules), )
 
-  /*
-   * Initialize zclient "update" and "lookup" sockets
-   */
-  pim_zebra_init();
-  pim_bfd_init ();
 
-  frr_config_fork();
+int main(int argc, char **argv, char **envp)
+{
+       frr_preinit(&pimd_di, argc, argv);
+       frr_opt_add("", longopts, "");
+
+       /* this while just reads the options */
+       while (1) {
+               int opt;
+
+               opt = frr_getopt(argc, argv, NULL);
+
+               if (opt == EOF)
+                       break;
+
+               switch (opt) {
+               case 0:
+                       break;
+               default:
+                       frr_help_exit(1);
+                       break;
+               }
+       }
+
+       master = frr_init();
+
+       /*
+        * Initializations
+        */
+       pim_error_init();
+       pim_vrf_init();
+       access_list_init();
+       prefix_list_init();
+       prefix_list_add_hook(pim_prefix_list_update);
+       prefix_list_delete_hook(pim_prefix_list_update);
+
+       pim_route_map_init();
+       pim_init();
+
+       /*
+        * Initialize zclient "update" and "lookup" sockets
+        */
+       pim_zebra_init();
+       pim_bfd_init();
+
+       frr_config_fork();
 
 #ifdef PIM_DEBUG_BYDEFAULT
-  zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands");
-  PIM_DO_DEBUG_PIM_EVENTS;
-  PIM_DO_DEBUG_PIM_PACKETS;
-  PIM_DO_DEBUG_PIM_TRACE;
-  PIM_DO_DEBUG_IGMP_EVENTS;
-  PIM_DO_DEBUG_IGMP_PACKETS;
-  PIM_DO_DEBUG_IGMP_TRACE;
-  PIM_DO_DEBUG_ZEBRA;
+       zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands");
+       PIM_DO_DEBUG_PIM_EVENTS;
+       PIM_DO_DEBUG_PIM_PACKETS;
+       PIM_DO_DEBUG_PIM_TRACE;
+       PIM_DO_DEBUG_IGMP_EVENTS;
+       PIM_DO_DEBUG_IGMP_PACKETS;
+       PIM_DO_DEBUG_IGMP_TRACE;
+       PIM_DO_DEBUG_ZEBRA;
 #endif
 
 #ifdef PIM_CHECK_RECV_IFINDEX_SANITY
-  zlog_notice("PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex");
+       zlog_notice(
+               "PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex");
 #ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH
-  zlog_notice("PIM_REPORT_RECV_IFINDEX_MISMATCH: will report sock/recv ifindex mismatch");
+       zlog_notice(
+               "PIM_REPORT_RECV_IFINDEX_MISMATCH: will report sock/recv ifindex mismatch");
 #endif
 #endif
 
 #ifdef PIM_UNEXPECTED_KERNEL_UPCALL
-  zlog_notice("PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall");
+       zlog_notice(
+               "PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall");
 #endif
 
-  frr_run(master);
+       frr_run(master);
 
-  /* never reached */
-  return 0;
+       /* never reached */
+       return 0;
 }