diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-05-20 18:32:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 18:32:07 +0200 |
| commit | 9807de3be368efdbb53e55a480aa3dd5ce67233f (patch) | |
| tree | f2013855911bf2888fbb756f56dea500fde9d65f /ospf6d/ospf6_top.c | |
| parent | 197191a0cecb7a25935327c93d9740272c6080f2 (diff) | |
| parent | cfb9e0ee595385f938b62b1a67d2650c91bcc8ee (diff) | |
Merge pull request #11223 from donaldsharp/ospf_shenanigans
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 8f482d7077..d48e85cedb 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -1372,9 +1372,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 +1465,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 +1756,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; } |