From 8fb15d02fe676de000754e56a183264ed89c6d81 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 6 Nov 2022 07:52:40 -0500 Subject: [PATCH] bgpd: In rpki use FOREACH_AFI_SAFI to loop over afi/safi Signed-off-by: Donald Sharp --- bgpd/bgp_rpki.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 2acf74c52b..b2abd51508 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -483,18 +483,14 @@ static void revalidate_all_routes(void) struct listnode *peer_listnode; for (ALL_LIST_ELEMENTS_RO(bgp->peer, peer_listnode, peer)) { + afi_t afi; + safi_t safi; - for (size_t i = 0; i < 2; i++) { - safi_t safi; - afi_t afi = (i == 0) ? AFI_IP : AFI_IP6; + FOREACH_AFI_SAFI (afi, safi) { + if (!peer->bgp->rib[afi][safi]) + continue; - for (safi = SAFI_UNICAST; safi < SAFI_MAX; - safi++) { - if (!peer->bgp->rib[afi][safi]) - continue; - - bgp_soft_reconfig_in(peer, afi, safi); - } + bgp_soft_reconfig_in(peer, afi, safi); } } } -- 2.39.5