From f0f77c9a590bf538033602a0b2da6084c9ea22e2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 1 Jun 2017 07:26:25 -0400 Subject: zebra: Refactor 'struct rib' to be 'struct route_entry' The 'struct rib' data structure is missnamed. It really is a 'struct route_entry' as part of the 'struct route_node'. We have 1 'struct route_entry' per route src. As such 1 route node can have multiple route entries if multiple protocols attempt to install the same route. Signed-off-by: Donald Sharp --- zebra/zebra_mpls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zebra/zebra_mpls.h') diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h index 1f17de67a..047b43213 100644 --- a/zebra/zebra_mpls.h +++ b/zebra/zebra_mpls.h @@ -208,13 +208,13 @@ zebra_mpls_write_label_block_config (struct vty *vty, struct zebra_vrf *vrf); * Install dynamic LSP entry. */ int -zebra_mpls_lsp_install (struct zebra_vrf *zvrf, struct route_node *rn, struct rib *rib); +zebra_mpls_lsp_install (struct zebra_vrf *zvrf, struct route_node *rn, struct route_entry *re); /* * Uninstall dynamic LSP entry, if any. */ int -zebra_mpls_lsp_uninstall (struct zebra_vrf *zvrf, struct route_node *rn, struct rib *rib); +zebra_mpls_lsp_uninstall (struct zebra_vrf *zvrf, struct route_node *rn, struct route_entry *re); /* * Registration from a client for the label binding for a FEC. If a binding @@ -449,9 +449,9 @@ lsp_distance (enum lsp_types_t type) * are converted into LSPs. */ static inline enum lsp_types_t -lsp_type_from_rib_type (int rib_type) +lsp_type_from_re_type (int re_type) { - switch (rib_type) + switch (re_type) { case ZEBRA_ROUTE_STATIC: return ZEBRA_LSP_STATIC; -- cgit v1.2.3