#include "libfrr.h"
#include "ripd/ripd.h"
+#include "ripd/rip_errors.h"
/* ripd options. */
-static struct option longopts[] =
-{
- { "retain", no_argument, NULL, 'r'},
- { 0 }
-};
+#if CONFDATE > 20190521
+ CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
+#endif
+static struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
/* ripd 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 ripd_privs =
-{
+struct zebra_privs_t ripd_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
-};
-
-/* Route retain mode flag. */
-int retain_mode = 0;
+ .caps_p = _caps_p,
+ .cap_num_p = 2,
+ .cap_num_i = 0};
/* Master of threads. */
struct thread_master *master;
static struct frr_daemon_info ripd_di;
/* SIGHUP handler. */
-static void
-sighup (void)
+static void sighup(void)
{
- zlog_info ("SIGHUP received");
- rip_clean ();
- rip_reset ();
- zlog_info ("ripd restarting!");
+ zlog_info("SIGHUP received");
+ rip_clean();
+ rip_reset();
+ zlog_info("ripd restarting!");
- /* Reload config file. */
- vty_read_config (ripd_di.config_file, config_default);
+ /* Reload config file. */
+ vty_read_config(NULL, ripd_di.config_file, config_default);
- /* Try to return to normal operation. */
+ /* Try to return to normal operation. */
}
/* SIGINT handler. */
-static void
-sigint (void)
+static void sigint(void)
{
- zlog_notice ("Terminating on signal");
+ zlog_notice("Terminating on signal");
+
+ rip_clean();
- if (! retain_mode)
- rip_clean ();
+ rip_zclient_stop();
+ frr_fini();
- exit (0);
+ exit(0);
}
/* SIGUSR1 handler. */
-static void
-sigusr1 (void)
+static void sigusr1(void)
{
- zlog_rotate();
+ zlog_rotate();
}
-static struct quagga_signal_t ripd_signals[] =
-{
- {
- .signal = SIGHUP,
- .handler = &sighup,
- },
- {
- .signal = SIGUSR1,
- .handler = &sigusr1,
- },
- {
- .signal = SIGINT,
- .handler = &sigint,
- },
- {
- .signal = SIGTERM,
- .handler = &sigint,
- },
-};
-
-FRR_DAEMON_INFO(ripd, RIP,
- .vty_port = RIP_VTY_PORT,
-
- .proghelp = "Implementation of the RIP routing protocol.",
-
- .signals = ripd_signals,
- .n_signals = array_size(ripd_signals),
-
- .privs = &ripd_privs,
-)
+static struct quagga_signal_t ripd_signals[] = {
+ {
+ .signal = SIGHUP,
+ .handler = &sighup,
+ },
+ {
+ .signal = SIGUSR1,
+ .handler = &sigusr1,
+ },
+ {
+ .signal = SIGINT,
+ .handler = &sigint,
+ },
+ {
+ .signal = SIGTERM,
+ .handler = &sigint,
+ },
+};
+
+static const struct frr_yang_module_info *ripd_yang_modules[] = {
+ &frr_interface_info,
+ &frr_ripd_info,
+};
+
+FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT,
+
+ .proghelp = "Implementation of the RIP routing protocol.",
+
+ .signals = ripd_signals, .n_signals = array_size(ripd_signals),
+
+ .privs = &ripd_privs, .yang_modules = ripd_yang_modules,
+ .n_yang_modules = array_size(ripd_yang_modules), )
+
+#if CONFDATE > 20190521
+CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
+#endif
+#define DEPRECATED_OPTIONS "r"
/* Main routine of ripd. */
-int
-main (int argc, char **argv)
+int main(int argc, char **argv)
{
- frr_preinit (&ripd_di, argc, argv);
- frr_opt_add ("r", longopts,
- " -r, --retain When program terminates, retain added route by ripd.\n");
+ frr_preinit(&ripd_di, argc, argv);
- /* Command line option parse. */
- while (1)
- {
- int opt;
+ frr_opt_add("" DEPRECATED_OPTIONS, longopts, "");
- opt = frr_getopt (argc, argv, NULL);
-
- if (opt == EOF)
- break;
+ /* Command line option parse. */
+ 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;
+ }
}
- }
- /* Prepare master thread. */
- master = frr_init ();
+ /* Prepare master thread. */
+ master = frr_init();
- /* Library initialization. */
- keychain_init ();
- vrf_init (NULL, NULL, NULL, NULL);
+ /* Library initialization. */
+ rip_error_init();
+ keychain_init();
+ vrf_init(NULL, NULL, NULL, NULL, NULL);
- /* RIP related initialization. */
- rip_init ();
- rip_if_init ();
- rip_zclient_init(master);
- rip_peer_init ();
+ /* RIP related initialization. */
+ rip_init();
+ rip_if_init();
+ rip_cli_init();
+ rip_zclient_init(master);
+ rip_peer_init();
- frr_config_fork ();
- frr_run (master);
+ frr_config_fork();
+ frr_run(master);
- /* Not reached. */
- return (0);
+ /* Not reached. */
+ return (0);
}
projects / mirror_frr.git / blobdiff