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_advertise.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_advertise.c')
| -rw-r--r-- | bgpd/bgp_advertise.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c index 9ee6a24bc5..1ebe4e5b53 100644 --- a/bgpd/bgp_advertise.c +++ b/bgpd/bgp_advertise.c @@ -144,7 +144,7 @@ void bgp_advertise_unintern(struct hash *hash, struct bgp_advertise_attr *baa) } } -bool bgp_adj_out_lookup(struct peer *peer, struct bgp_node *rn, +bool bgp_adj_out_lookup(struct peer *peer, struct bgp_dest *dest, uint32_t addpath_tx_id) { struct bgp_adj_out *adj; @@ -153,7 +153,7 @@ bool bgp_adj_out_lookup(struct peer *peer, struct bgp_node *rn, safi_t safi; int addpath_capable; - RB_FOREACH (adj, bgp_adj_out_rb, &rn->adj_out) + RB_FOREACH (adj, bgp_adj_out_rb, &dest->adj_out) SUBGRP_FOREACH_PEER (adj->subgroup, paf) if (paf->peer == peer) { afi = SUBGRP_AFI(adj->subgroup); @@ -178,12 +178,12 @@ bool bgp_adj_out_lookup(struct peer *peer, struct bgp_node *rn, } -void bgp_adj_in_set(struct bgp_node *rn, struct peer *peer, struct attr *attr, +void bgp_adj_in_set(struct bgp_dest *dest, struct peer *peer, struct attr *attr, uint32_t addpath_id) { struct bgp_adj_in *adj; - for (adj = rn->adj_in; adj; adj = adj->next) { + for (adj = dest->adj_in; adj; adj = adj->next) { if (adj->peer == peer && adj->addpath_rx_id == addpath_id) { if (adj->attr != attr) { bgp_attr_unintern(&adj->attr); @@ -197,25 +197,25 @@ void bgp_adj_in_set(struct bgp_node *rn, struct peer *peer, struct attr *attr, adj->attr = bgp_attr_intern(attr); adj->uptime = bgp_clock(); adj->addpath_rx_id = addpath_id; - BGP_ADJ_IN_ADD(rn, adj); - bgp_lock_node(rn); + BGP_ADJ_IN_ADD(dest, adj); + bgp_dest_lock_node(dest); } -void bgp_adj_in_remove(struct bgp_node *rn, struct bgp_adj_in *bai) +void bgp_adj_in_remove(struct bgp_dest *dest, struct bgp_adj_in *bai) { bgp_attr_unintern(&bai->attr); - BGP_ADJ_IN_DEL(rn, bai); + BGP_ADJ_IN_DEL(dest, bai); peer_unlock(bai->peer); /* adj_in peer reference */ XFREE(MTYPE_BGP_ADJ_IN, bai); } -bool bgp_adj_in_unset(struct bgp_node *rn, struct peer *peer, +bool bgp_adj_in_unset(struct bgp_dest *dest, struct peer *peer, uint32_t addpath_id) { struct bgp_adj_in *adj; struct bgp_adj_in *adj_next; - adj = rn->adj_in; + adj = dest->adj_in; if (!adj) return false; @@ -224,8 +224,8 @@ bool bgp_adj_in_unset(struct bgp_node *rn, struct peer *peer, adj_next = adj->next; if (adj->peer == peer && adj->addpath_rx_id == addpath_id) { - bgp_adj_in_remove(rn, adj); - bgp_unlock_node(rn); + bgp_adj_in_remove(dest, adj); + bgp_dest_unlock_node(dest); } adj = adj_next; |