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

Merge pull request #13160 from chiragshah6/fdev2

Browse Source 
ospfd:display correct DR-BDR router-id in nbr cmd
This commit is contained in:
Russ White 2023-04-04 10:02:48 -04:00 committed by GitHub
commit 4d0f3e819d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ospfd/ospf_vty.c
View File

@ -5072,6 +5072,7 @@ static void show_ip_ospf_neighbor_detail_sub(struct vty *vty,
json_object *json_neigh = NULL, *json_neigh_array = NULL; json_object *json_neigh = NULL, *json_neigh_array = NULL;
char neigh_str[INET_ADDRSTRLEN] = {0}; char neigh_str[INET_ADDRSTRLEN] = {0};
char neigh_state[16] = {0}; char neigh_state[16] = {0};
struct ospf_neighbor *nbr_dr, *nbr_bdr;
if (use_json) { if (use_json) {
if (prev_nbr && if (prev_nbr &&
@ -5199,19 +5200,38 @@ static void show_ip_ospf_neighbor_detail_sub(struct vty *vty,
} }
} }
/* Show Designated Rotuer ID. */ /* Show Designated Router ID. */
if (use_json) if (DR(oi).s_addr == INADDR_ANY) {
json_object_string_addf(json_neigh, "routerDesignatedId", if (!use_json)
"%pI4", &nbr->d_router); vty_out(vty,
else " No designated router on this network\n");
vty_out(vty, " DR is %pI4,", &nbr->d_router); } else {
nbr_dr = ospf_nbr_lookup_by_addr(oi->nbrs, &DR(oi));
if (nbr_dr) {
if (use_json)
json_object_string_addf(
json_neigh, "routerDesignatedId",
"%pI4", &nbr_dr->router_id);
else
vty_out(vty, " DR is %pI4,",
&nbr_dr->router_id);
}
}
/* Show Backup Designated Rotuer ID. */ /* Show Backup Designated Router ID. */
if (use_json) nbr_bdr = ospf_nbr_lookup_by_addr(oi->nbrs, &BDR(oi));
json_object_string_addf(json_neigh, "routerDesignatedBackupId", if (nbr_bdr == NULL) {
"%pI4", &nbr->bd_router); if (!use_json)
else vty_out(vty,
vty_out(vty, " BDR is %pI4\n", &nbr->bd_router); " No backup designated router on this network\n");
} else {
if (use_json)
json_object_string_addf(json_neigh,
"routerDesignatedBackupId",
"%pI4", &nbr_bdr->router_id);
else
vty_out(vty, " BDR is %pI4\n", &nbr_bdr->router_id);
}
/* Show options. */ /* Show options. */
if (use_json) { if (use_json) {