diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-10-02 20:43:07 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-10-09 14:26:30 -0400 |
| commit | 40381db7854c8c9bf7f6e37affc625aaf36131c7 (patch) | |
| tree | 8b68bb9bb2b02754ca0cea513ef75287fff6fe47 /bgpd/bgp_label.c | |
| parent | 9b6d8fcf29cee8a748daedf4ba9ce8704fef1a02 (diff) | |
bgpd: Rename various variable names to something more appropriate
ri -> pi
bi -> bpi
info -> path
info -> rmap_path ( for routemap applications )
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_label.c')
| -rw-r--r-- | bgpd/bgp_label.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c index 0764280d93..dcaaea6868 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -94,18 +94,18 @@ int bgp_parse_fec_update(void) return 1; } -mpls_label_t bgp_adv_label(struct bgp_node *rn, struct bgp_path_info *ri, +mpls_label_t bgp_adv_label(struct bgp_node *rn, struct bgp_path_info *pi, struct peer *to, afi_t afi, safi_t safi) { struct peer *from; mpls_label_t remote_label; int reflect; - if (!rn || !ri || !to) + if (!rn || !pi || !to) return MPLS_INVALID_LABEL; - remote_label = ri->extra ? ri->extra->label[0] : MPLS_INVALID_LABEL; - from = ri->peer; + remote_label = pi->extra ? pi->extra->label[0] : MPLS_INVALID_LABEL; + from = pi->peer; reflect = ((from->sort == BGP_PEER_IBGP) && (to->sort == BGP_PEER_IBGP)); @@ -120,7 +120,7 @@ mpls_label_t bgp_adv_label(struct bgp_node *rn, struct bgp_path_info *ri, return rn->local_label; } -void bgp_reg_dereg_for_label(struct bgp_node *rn, struct bgp_path_info *ri, +void bgp_reg_dereg_for_label(struct bgp_node *rn, struct bgp_path_info *pi, int reg) { struct stream *s; @@ -143,11 +143,11 @@ void bgp_reg_dereg_for_label(struct bgp_node *rn, struct bgp_path_info *ri, stream_putw(s, PREFIX_FAMILY(p)); stream_put_prefix(s, p); if (reg) { - assert(ri); - if (ri->attr->flag & ATTR_FLAG_BIT(BGP_ATTR_PREFIX_SID)) { - if (ri->attr->label_index != BGP_INVALID_LABEL_INDEX) { + assert(pi); + if (pi->attr->flag & ATTR_FLAG_BIT(BGP_ATTR_PREFIX_SID)) { + if (pi->attr->label_index != BGP_INVALID_LABEL_INDEX) { flags |= ZEBRA_FEC_REGISTER_LABEL_INDEX; - stream_putl(s, ri->attr->label_index); + stream_putl(s, pi->attr->label_index); } } SET_FLAG(rn->flags, BGP_NODE_REGISTERED_FOR_LABEL); |