diff options
| -rw-r--r-- | bgpd/bgp_evpn.c | 3 | ||||
| -rw-r--r-- | ospf6d/ospf6_spf.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6d.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c index 8c3a1b337b..6923479cb2 100644 --- a/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c @@ -2047,7 +2047,6 @@ static void evpn_mpattr_encode_type5(struct stream *s, struct prefix *p, len = 8; /* ipv4 */ else len = 32; /* ipv6 */ - stream_putc(s, BGP_EVPN_IP_PREFIX_ROUTE); /* Prefix contains RD, ESI, EthTag, IP length, IP, GWIP and VNI */ stream_putc(s, 8 + 10 + 4 + 1 + len + 3); stream_put(s, prd->val, 8); @@ -2288,6 +2287,8 @@ char *bgp_evpn_route2str(struct prefix_evpn *p, char *buf, int len) } } else { /* For EVPN route types not supported yet. */ + snprintf(buf, len, "(unsupported route type %d)", + p->prefix.route_type); } return (buf); diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 6d589aff8f..ccfa25aaa8 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -576,6 +576,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) /* execute SPF calculation */ monotime(&start); + ospf6->ts_spf = start; if (ospf6_is_router_abr(ospf6)) ospf6_abr_range_reset_cost(ospf6); @@ -585,6 +586,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) if (oa == ospf6->backbone) continue; + monotime(&oa->ts_spf); if (IS_OSPF6_DEBUG_SPF(PROCESS)) zlog_debug("SPF calculation for Area %s", oa->name); if (IS_OSPF6_DEBUG_SPF(DATABASE)) @@ -598,6 +600,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) } if (ospf6->backbone) { + monotime(&ospf6->backbone->ts_spf); if (IS_OSPF6_DEBUG_SPF(PROCESS)) zlog_debug("SPF calculation for Backbone area %s", ospf6->backbone->name); @@ -632,6 +635,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) "Reason: %s\n", areas_processed, (long long)runtime.tv_sec, (long long)runtime.tv_usec, rbuf); + ospf6->last_spf_reason = ospf6->spf_reason; ospf6_reset_spf_reason(ospf6); return 0; diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index e77bf690f3..9794e92b06 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -832,7 +832,7 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o) (long long)o->ts_spf_duration.tv_sec, (long long)o->ts_spf_duration.tv_usec); } else - vty_out(vty, "has not been run$\n"); + vty_out(vty, "has not been run\n"); 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); diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 84a56fb505..d28d9dd064 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -1098,7 +1098,7 @@ DEFUN (show_ipv6_ospf6_linkstate, "Specify Router ID as IPv4 address notation\n" "Specify Link state ID as IPv4 address notation\n") { - int idx_ipv4 = 4; + int idx_ipv4 = 5; struct listnode *node; struct ospf6_area *oa; |