summaryrefslogtreecommitdiff
path: root/zebra/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/main.c')
-rw-r--r--zebra/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/zebra/main.c b/zebra/main.c
index 334354eaae..75f825e507 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -27,7 +27,6 @@
#include "filter.h"
#include "memory.h"
#include "zebra_memory.h"
-#include "memory_vty.h"
#include "prefix.h"
#include "log.h"
#include "plist.h"
@@ -84,7 +83,7 @@ uint32_t nl_rcvbufsize = 4194304;
#define OPTION_V6_RR_SEMANTICS 2000
/* Command line options. */
-struct option longopts[] = {
+const struct option longopts[] = {
{"batch", no_argument, NULL, 'b'},
{"allow_delete", no_argument, NULL, 'a'},
{"keep_kernel", no_argument, NULL, 'k'},
@@ -145,6 +144,9 @@ static void sigint(void)
atomic_store_explicit(&zrouter.in_shutdown, true,
memory_order_relaxed);
+ /* send RA lifetime of 0 before stopping. rfc4861/6.2.5 */
+ rtadv_stop_ra_all();
+
frr_early_fini();
zebra_dplane_pre_finish();
@@ -229,7 +231,7 @@ struct quagga_signal_t zebra_signals[] = {
},
};
-static const struct frr_yang_module_info *zebra_yang_modules[] = {
+static const struct frr_yang_module_info *const zebra_yang_modules[] = {
&frr_interface_info,
};