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

ospfd: small bugfix for miscounting A[S]BRs

Browse Source 
- improve the debug for the second add router call.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2022-02-06 09:40:24 -05:00 committed by Christian Hopps
parent 1794afe010
commit 1eea62bb1c
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ospfd/ospf_route.c
View File

@ -348,45 +348,50 @@ void ospf_route_install(struct ospf *ospf, struct route_table *rt)
/* RFC2328 16.1. (4). For "router". */
void ospf_intra_add_router(struct route_table *rt, struct vertex *v,
struct ospf_area *area, bool add_all)
struct ospf_area *area, bool add_only)
{
struct route_node *rn;
struct ospf_route * or ;
struct prefix_ipv4 p;
struct router_lsa *lsa;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: Start", __func__);
if (IS_DEBUG_OSPF_EVENT) {
if (!add_only)
zlog_debug("%s: Start", __func__);
else
zlog_debug("%s: REACHRUN: Start", __func__);
}
lsa = (struct router_lsa *)v->lsa;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: LS ID: %pI4", __func__, &lsa->header.id);
if (!OSPF_IS_AREA_BACKBONE(area))
ospf_vl_up_check(area, lsa->header.id, v);
if (!add_only) {
if (!OSPF_IS_AREA_BACKBONE(area))
ospf_vl_up_check(area, lsa->header.id, v);
if (!CHECK_FLAG(lsa->flags, ROUTER_LSA_SHORTCUT))
area->shortcut_capability = 0;
if (!CHECK_FLAG(lsa->flags, ROUTER_LSA_SHORTCUT))
area->shortcut_capability = 0;
/* If the newly added vertex is an area border router or AS boundary
router, a routing table entry is added whose destination type is
"router". */
if (!add_all && !IS_ROUTER_LSA_BORDER(lsa) &&
!IS_ROUTER_LSA_EXTERNAL(lsa)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"%s: this router is neither ASBR nor ABR, skipping it",
__func__);
return;
/* If the newly added vertex is an area border router or AS
boundary router, a routing table entry is added whose
destination type is "router". */
if (!IS_ROUTER_LSA_BORDER(lsa) &&
!IS_ROUTER_LSA_EXTERNAL(lsa)) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
"%s: this router is neither ASBR nor ABR, skipping it",
__func__);
return;
}
/* Update ABR and ASBR count in this area. */
if (IS_ROUTER_LSA_BORDER(lsa))
area->abr_count++;
if (IS_ROUTER_LSA_EXTERNAL(lsa))
area->asbr_count++;
}
/* Update ABR and ASBR count in this area. */
if (IS_ROUTER_LSA_BORDER(lsa))
area->abr_count++;
if (IS_ROUTER_LSA_EXTERNAL(lsa))
area->asbr_count++;
/* The Options field found in the associated router-LSA is copied
into the routing table entry's Optional capabilities field. Call
the newly added vertex Router X. */
@ -433,8 +438,12 @@ void ospf_intra_add_router(struct route_table *rt, struct vertex *v,
listnode_add(rn->info, or);
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: Stop", __func__);
if (IS_DEBUG_OSPF_EVENT) {
if (!add_only)
zlog_debug("%s: Stop", __func__);
else
zlog_debug("%s: REACHRUN: Stop", __func__);
}
}
/* RFC2328 16.1. (4). For transit network. */