diff options
| -rw-r--r-- | bgpd/bgp_zebra.c | 2 | ||||
| -rw-r--r-- | isisd/isis_spf.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_neighbor.c | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 12bc2e41bc..8d07e050f8 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -1176,7 +1176,7 @@ void bgp_zebra_announce(struct bgp_dest *dest, const struct prefix *p, int nh_othervrf = 0; char buf_prefix[PREFIX_STRLEN]; /* filled in if we are debugging */ bool is_evpn; - int nh_updated; + bool nh_updated = false; bool do_wt_ecmp; uint64_t cum_bw = 0; uint32_t nhg_id = 0; diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 47918ef47e..57b1d66c22 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -1267,7 +1267,7 @@ static void spf_adj_list_parse_tlv(struct isis_spftree *spftree, lsp = lsp_search(spftree->lspdb, lspid); if (lsp == NULL || lsp->hdr.rem_lifetime == 0) { zlog_warn("ISIS-SPF: No LSP found from root to L%d %s", - spftree->level, rawlspid_print(id)); + spftree->level, rawlspid_print(lspid)); return; } diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index c1905e8c1e..7a1b96c2b3 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -1075,9 +1075,10 @@ DEFUN (show_ipv6_ospf6_neighbor_one, for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, i, oa)) for (ALL_LIST_ELEMENTS_RO(oa->if_list, j, oi)) - for (ALL_LIST_ELEMENTS_RO(oi->neighbor_list, k, on)) - (*showfunc)(vty, on, json, uj); - + for (ALL_LIST_ELEMENTS_RO(oi->neighbor_list, k, on)) { + if (router_id == on->router_id) + (*showfunc)(vty, on, json, uj); + } if (uj) { vty_out(vty, "%s\n", |