diff options
| -rw-r--r-- | isisd/isis_spf.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_neighbor.c | 7 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 3 |
3 files changed, 7 insertions, 5 deletions
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", diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 1ca219a26c..6e28df79d6 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -153,7 +153,8 @@ static void usage(int status) progname); else printf("Usage : %s [OPTION...]\n\n" - "Integrated shell for FRR. \n\n" + "Integrated shell for FRR (version " FRR_VERSION "). \n" + "Configured with:\n " FRR_CONFIG_ARGS "\n\n" "-b, --boot Execute boot startup configuration\n" "-c, --command Execute argument as command\n" "-d, --daemon Connect only to the specified daemon\n" |