From 2b964e86994d9c4bb7c7ea160ea605db4f9c35de Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 12 Dec 2018 16:18:15 -0500 Subject: [PATCH] bgpd: Cleanup non-normal compiled code path Looks like we missed some code in a non-normal compiled code path for the bgp_path_info conversion. Signed-off-by: Donald Sharp --- bgpd/bgp_rpki.c | 3 ++- bgpd/bgp_snmp.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index c69997a41d..b614e87d23 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -418,7 +418,8 @@ static void revalidate_bgp_node(struct bgp_node *bgp_node, afi_t afi, for (ain = bgp_node->adj_in; ain; ain = ain->next) { int ret; - struct bgp_path_info *path = bgp_info_from_node(bgp_node); + struct bgp_path_info *path = + bgp_node_get_bgp_path_info(bgp_node); mpls_label_t *label = NULL; uint32_t num_labels = 0; diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index e9ba93bbd4..c1321dd7dc 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -715,7 +715,7 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], if (rn) { bgp_unlock_node(rn); - for (path = bgp_info_from_node(rn); path; + for (path = bgp_node_get_bgp_path_info(rn); path; path = path->next) if (sockunion_same(&path->peer->su, &su)) return path; @@ -763,7 +763,7 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], do { min = NULL; - for (path = bgp_info_from_node(rn); path; + for (path = bgp_node_get_bgp_path_info(rn); path; path = path->next) { if (path->peer->su.sin.sin_family == AF_INET && ntohl(paddr.s_addr)