proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 05:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nhrpd: Display post-nat NBMA for local addresses

Browse Source 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
This commit is contained in:
Amold Lad 2021-03-19 16:23:53 +05:30 committed by Reuben Dowle
parent 6baf035ce3
commit bcf5673d61
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nhrpd/nhrp_vty.c
View File

@ -645,19 +645,36 @@ static void show_ip_nhrp_cache(struct nhrp_cache *c, void *pctx)
ctx->count++;
sockunion2str(&c->remote_addr, buf[0], sizeof(buf[0]));
if (c->cur.peer)
sockunion2str(&c->cur.peer->vc->remote.nbma,
buf[1], sizeof(buf[1]));
else
snprintf(buf[1], sizeof(buf[1]), "-");
if (c->cur.type == NHRP_CACHE_LOCAL) {
struct nhrp_interface *nifp = c->ifp->info;
if (c->cur.peer
&& sockunion_family(&c->cur.remote_nbma_claimed) != AF_UNSPEC)
sockunion2str(&c->cur.remote_nbma_claimed,
buf[2], sizeof(buf[2]));
if (sockunion_family(&nifp->nbma) != AF_UNSPEC) {
sockunion2str(&nifp->nbma, buf[1], sizeof(buf[1]));
sockunion2str(&nifp->nbma, buf[2], sizeof(buf[2]));
}
else {
snprintf(buf[1], sizeof(buf[1]), "-");
snprintf(buf[2], sizeof(buf[2]), "-");
}
else
snprintf(buf[2], sizeof(buf[2]), "-");
/* if we are behind NAT then update NBMA field */
if (sockunion_family(&nifp->nat_nbma) != AF_UNSPEC)
sockunion2str(&nifp->nat_nbma, buf[1], sizeof(buf[1]));
} else {
if (c->cur.peer)
sockunion2str(&c->cur.peer->vc->remote.nbma,
buf[1], sizeof(buf[1]));
else
snprintf(buf[1], sizeof(buf[1]), "-");
if (c->cur.peer
&& sockunion_family(&c->cur.remote_nbma_claimed)
!= AF_UNSPEC)
sockunion2str(&c->cur.remote_nbma_claimed,
buf[2], sizeof(buf[2]));
else
snprintf(buf[2], sizeof(buf[2]), "-");
}
if (ctx->json) {
json = json_object_new_object();