Merge pull request #12329 from opensourcerouting/feature/graceful-shutdown_per_peer

[mirror_frr.git] / ospf6d / ospf6_top.c

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 8f482d707771ac8d9157849dcc945ca451301111..eb89a14cd3829db7ea28dc947589e5d677a18a0a 100644 (file)
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -65,9 +65,7 @@ FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES,
        { .val_bool = false },
 );
 
-#ifndef VTYSH_EXTRACT_PL
 #include "ospf6d/ospf6_top_clippy.c"
-#endif
 
 /* global ospf6d variable */
 static struct ospf6_master ospf6_master;
@@ -1372,9 +1370,7 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json,
                } else
                        json_object_boolean_false_add(json, "spfHasRun");
 
-
-               threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf));
-               if (o->t_spf_calc) {
+               if (thread_is_scheduled(o->t_spf_calc)) {
                        long time_store;
 
                        json_object_boolean_true_add(json, "spfTimerActive");
@@ -1467,7 +1463,9 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json,
 
                threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf));
                vty_out(vty, " SPF timer %s%s\n",
-                       (o->t_spf_calc ? "due in " : "is "), buf);
+                       (thread_is_scheduled(o->t_spf_calc) ? "due in "
+                                                           : "is "),
+                       buf);
 
                if (CHECK_FLAG(o->flag, OSPF6_STUB_ROUTER))
                        vty_out(vty, " Router Is Stub Router\n");
@@ -1756,14 +1754,10 @@ DEFUN(show_ipv6_ospf6_route_type_detail, show_ipv6_ospf6_route_type_detail_cmd,
 
 bool ospf6_is_valid_summary_addr(struct vty *vty, struct prefix *p)
 {
-       struct in6_addr addr_zero;
-
-       memset(&addr_zero, 0, sizeof(addr_zero));
-
-        /* Default prefix validation*/
-       if ((is_default_prefix(p)) ||
-           (!memcmp(&p->u.prefix6, &addr_zero, sizeof(struct in6_addr)))) {
-               vty_out(vty, "Default address should not be configured as summary address.\n");
+       /* Default prefix validation*/
+       if (is_default_prefix(p)) {
+               vty_out(vty,
+                       "Default address should not be configured as summary address.\n");
                return false;
        }