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

[mirror_frr.git] / ripngd / ripng_main.c

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index e5178171471f3b9d05792d1aefd834826dd6815e..10e19efe77f6962fc39cea79f2378adcb0a52f1c 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -40,40 +40,28 @@
 #include "ripngd/ripngd.h"
 
 /* RIPngd options. */
-struct option longopts[] = 
-{
-  { "retain",      no_argument,       NULL, 'r'},
-  { 0 }
-};
+#if CONFDATE > 20190521
+       CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
+#endif
+struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
 
 /* ripngd privileges */
-zebra_capabilities_t _caps_p [] = 
-{
-  ZCAP_NET_RAW,
-  ZCAP_BIND
-};
+zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND};
 
-struct zebra_privs_t ripngd_privs =
-{
+struct zebra_privs_t ripngd_privs = {
 #if defined(FRR_USER)
-  .user = FRR_USER,
+       .user = FRR_USER,
 #endif
 #if defined FRR_GROUP
-  .group = FRR_GROUP,
+       .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+       .vty_group = VTY_GROUP,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = 2,
-  .cap_num_i = 0
-};
-
-
-/* RIPngd program name */
+       .caps_p = _caps_p,
+       .cap_num_p = 2,
+       .cap_num_i = 0};
 
-/* Route retain mode flag. */
-int retain_mode = 0;
 
 /* Master of threads. */
 struct thread_master *master;
@@ -81,112 +69,118 @@ struct thread_master *master;
 static struct frr_daemon_info ripngd_di;
 
 /* SIGHUP handler. */
-static void 
-sighup (void)
+static void sighup(void)
 {
-  zlog_info ("SIGHUP received");
-  ripng_clean ();
-  ripng_reset ();
+       zlog_info("SIGHUP received");
 
-  /* Reload config file. */
-  vty_read_config (ripngd_di.config_file, config_default);
-
-  /* Try to return to normal operation. */
+       /* Reload config file. */
+       vty_read_config(NULL, ripngd_di.config_file, config_default);
 }
 
 /* SIGINT handler. */
-static void
-sigint (void)
+static void sigint(void)
 {
-  zlog_notice ("Terminating on signal");
+       zlog_notice("Terminating on signal");
 
-  if (! retain_mode)
-    ripng_clean ();
+       ripng_clean();
 
-  exit (0);
+       ripng_zebra_stop();
+       frr_fini();
+       exit(0);
 }
 
 /* SIGUSR1 handler. */
-static void
-sigusr1 (void)
+static void sigusr1(void)
 {
-  zlog_rotate();
+       zlog_rotate();
 }
 
-struct quagga_signal_t ripng_signals[] =
-{
-  { 
-    .signal = SIGHUP, 
-    .handler = &sighup,
-  },
-  {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
-  },
-  {
-    .signal = SIGINT,
-    .handler = &sigint,
-  },
-  {
-    .signal = SIGTERM,
-    .handler = &sigint,
-  },
+struct quagga_signal_t ripng_signals[] = {
+       {
+               .signal = SIGHUP,
+               .handler = &sighup,
+       },
+       {
+               .signal = SIGUSR1,
+               .handler = &sigusr1,
+       },
+       {
+               .signal = SIGINT,
+               .handler = &sigint,
+       },
+       {
+               .signal = SIGTERM,
+               .handler = &sigint,
+       },
 };
 
-FRR_DAEMON_INFO(ripngd, RIPNG,
-       .vty_port = RIPNG_VTY_PORT,
+static const struct frr_yang_module_info *ripngd_yang_modules[] = {
+       &frr_interface_info,
+       &frr_ripngd_info,
+};
+
+FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
+
+               .proghelp = "Implementation of the RIPng routing protocol.",
 
-       .proghelp = "Implementation of the RIPng routing protocol.",
+               .signals = ripng_signals,
+               .n_signals = array_size(ripng_signals),
 
-       .signals = ripng_signals,
-       .n_signals = array_size(ripng_signals),
+               .privs = &ripngd_privs,
 
-       .privs = &ripngd_privs,
-)
+               .yang_modules = ripngd_yang_modules,
+               .n_yang_modules = array_size(ripngd_yang_modules), )
+
+#if CONFDATE > 20190521
+CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
+#endif
+#define DEPRECATED_OPTIONS "r"
 
 /* RIPngd main routine. */
-int
-main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-  frr_preinit (&ripngd_di, argc, argv);
-  frr_opt_add ("r", longopts,
-       "  -r, --retain       When program terminates, retain added route by ripd.\n");
+       frr_preinit(&ripngd_di, argc, argv);
 
-  while (1) 
-    {
-      int opt;
+       frr_opt_add("" DEPRECATED_OPTIONS, longopts, "");
 
-      opt = frr_getopt (argc, argv, NULL);
-    
-      if (opt == EOF)
-       break;
+       while (1) {
+               int opt;
 
-      switch (opt) 
-       {
-       case 0:
-         break;
-       case 'r':
-         retain_mode = 1;
-         break;
-       default:
-         frr_help_exit (1);
-         break;
+               opt = frr_getopt(argc, argv, NULL);
+
+               if (opt && opt < 128 && strchr(DEPRECATED_OPTIONS, opt)) {
+                       fprintf(stderr,
+                               "The -%c option no longer exists.\nPlease refer to the manual.\n",
+                               opt);
+                       continue;
+               }
+
+               if (opt == EOF)
+                       break;
+
+               switch (opt) {
+               case 0:
+                       break;
+               default:
+                       frr_help_exit(1);
+                       break;
+               }
        }
-    }
 
-  master = frr_init ();
+       master = frr_init();
 
-  /* Library inits. */
-  vrf_init (NULL, NULL, NULL, NULL);
+       /* Library inits. */
+       vrf_init(NULL, NULL, NULL, NULL, NULL);
 
-  /* RIPngd inits. */
-  ripng_init ();
-  zebra_init(master);
-  ripng_peer_init ();
+       /* RIPngd inits. */
+       ripng_init();
+       ripng_cli_init();
+       zebra_init(master);
+       ripng_peer_init();
 
-  frr_config_fork ();
-  frr_run (master);
+       frr_config_fork();
+       frr_run(master);
 
-  /* Not reached. */
-  return 0;
+       /* Not reached. */
+       return 0;
 }