diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-03-26 19:11:58 -0400 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-06-23 17:32:52 +0200 |
| commit | 9bcb3eef541180a17341d1d4510586efc35711db (patch) | |
| tree | 686e6d7721a180a168cb3353e2c900b63069e6c3 /bgpd/bgp_snmp.c | |
| parent | 6d7824f29c4aad88009ac1dfe0491de31c01fcb3 (diff) | |
bgp: rename bgp_node to bgp_dest
This is the bulk part extracted from "bgpd: Convert from `struct
bgp_node` to `struct bgp_dest`". It should not result in any functional
change.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_snmp.c')
| -rw-r--r-- | bgpd/bgp_snmp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index e7aa02863c..719ff1452b 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -660,7 +660,7 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], int offsetlen; struct bgp_path_info *path; struct bgp_path_info *min; - struct bgp_node *rn; + struct bgp_dest *dest; union sockunion su; unsigned int len; struct in_addr paddr; @@ -687,12 +687,12 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], oid2in_addr(offset, IN_ADDR_SIZE, &su.sin.sin_addr); /* Lookup node. */ - rn = bgp_node_lookup(bgp->rib[AFI_IP][SAFI_UNICAST], - (struct prefix *)addr); - if (rn) { - bgp_unlock_node(rn); + dest = bgp_node_lookup(bgp->rib[AFI_IP][SAFI_UNICAST], + (struct prefix *)addr); + if (dest) { + bgp_dest_unlock_node(dest); - for (path = bgp_node_get_bgp_path_info(rn); path; + for (path = bgp_dest_get_bgp_path_info(dest); path; path = path->next) if (sockunion_same(&path->peer->su, &su)) return path; @@ -703,7 +703,7 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], len = offsetlen; if (offsetlen == 0) - rn = bgp_table_top(bgp->rib[AFI_IP][SAFI_UNICAST]); + dest = bgp_table_top(bgp->rib[AFI_IP][SAFI_UNICAST]); else { if (len > IN_ADDR_SIZE) len = IN_ADDR_SIZE; @@ -718,8 +718,8 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], else addr->prefixlen = len * 8; - rn = bgp_node_get(bgp->rib[AFI_IP][SAFI_UNICAST], - (struct prefix *)addr); + dest = bgp_node_get(bgp->rib[AFI_IP][SAFI_UNICAST], + (struct prefix *)addr); offset++; offsetlen--; @@ -734,13 +734,13 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], } else paddr.s_addr = INADDR_ANY; - if (!rn) + if (!dest) return NULL; do { min = NULL; - for (path = bgp_node_get_bgp_path_info(rn); path; + for (path = bgp_dest_get_bgp_path_info(dest); path; path = path->next) { if (path->peer->su.sin.sin_family == AF_INET && ntohl(paddr.s_addr) @@ -762,7 +762,7 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], if (min) { const struct prefix *rn_p = - bgp_node_get_prefix(rn); + bgp_dest_get_prefix(dest); *length = v->namelen + BGP_PATHATTR_ENTRY_OFFSET; @@ -779,13 +779,13 @@ static struct bgp_path_info *bgp4PathAttrLookup(struct variable *v, oid name[], addr->prefix = rn_p->u.prefix4; addr->prefixlen = rn_p->prefixlen; - bgp_unlock_node(rn); + bgp_dest_unlock_node(dest); return min; } paddr.s_addr = INADDR_ANY; - } while ((rn = bgp_route_next(rn)) != NULL); + } while ((dest = bgp_route_next(dest)) != NULL); } return NULL; } |