Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nhrpd: fix show ip nhrp output #16700

Merged
merged 2 commits into from
Nov 28, 2024
Merged

nhrpd: fix show ip nhrp output #16700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d62d9
nhrpd: fix sh ip nhrp opennhrp json counter
louis-6wind Aug 30, 2024
e2db455
nhrpd: normalize sh ip nhrp opennhrp output
louis-6wind Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions nhrpd/nhrp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,10 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)
if (ctx->afi != family2afi(sockunion_family(&c->remote_addr)))
return;

if (ctx->count && !ctx->json)
vty_out(ctx->vty, "\n");
ctx->count++;

sockunion2str(&c->remote_addr, buf[0], sizeof(buf[0]));
if (c->cur.peer)
sockunion2str(&c->cur.peer->vc->remote.nbma, buf[1],
Expand Down Expand Up @@ -986,8 +990,6 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)

if (sockunion_family(&c->cur.remote_nbma_natoa) != AF_UNSPEC)
vty_out(ctx->vty, "NBMA-NAT-OA-Address: %s\n", buf[2]);

vty_out(ctx->vty, "\n\n");
}

DEFUN(show_ip_nhrp, show_ip_nhrp_cmd,
Expand Down Expand Up @@ -1031,7 +1033,6 @@ DEFUN(show_ip_nhrp, show_ip_nhrp_cmd,
else
json_object_string_add(json_vrf, "status", "ok");

ctx.count++;
FOR_ALL_INTERFACES (vrf, ifp)
nhrp_cache_foreach(ifp, show_ip_opennhrp_cache, &ctx);
}
Expand Down
Loading