lib, zebra: move "struct vrf" to be a lib module
Previously "struct vrf" is defined locally in zebra. Now it is moved
to be a lib module.
This is the first step to support multi-VRF in quagga. The
implementation is splitted into small patches for the purpose of
easy review.
* lib:
"struct vrf" with basic members is defined in vrf.c. The member
"void *info" is for user data.
Some basic functions are defined in vrf.c for adding/deleting/
looking up a VRF, scanning the VRF table and initializing the
VRF module.
The type "vrf_id_t" is defined specificly for VRF ID.
* zebra:
The previous "struct vrf" is re-defined as "struct zebra_vrf";
and previous "vrf" variables are renamed to "zvrf".
The previous "struct vrf" related functions are removed from
zbera_rib.c. New functions are defined to maintain the new
"struct zebra_vrf".
The names vrf_xxx are reserved for the functions in VRF module.
So:
- the previous vrf_table() are renamed to zebra_vrf_table();
- the previous vrf_static_table() are renamed to
zebra_vrf_static_table().
The main logic is not changed.
BTW: Add a statement to zebra_snmp.c telling that the SNMP is
running only for the MIBs in the default VRF.
Signed-off-by: Feng Lu <lu.feng@6wind.com>
Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index f247f1d..f206205 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -34,6 +34,7 @@
#include "workqueue.h"
#include "prefix.h"
#include "routemap.h"
+#include "vrf.h"
#include "zebra/rib.h"
#include "zebra/rt.h"
@@ -72,9 +73,6 @@
/* no entry/default: 150 */
};
-/* Vector for routing table. */
-static vector vrf_vector;
-
/* RPF lookup behaviour */
static enum multicast_mode ipv4_multicast_mode = MCAST_NO_CONFIG;
@@ -112,108 +110,6 @@
_rnode_zlog(__func__, node, LOG_INFO, __VA_ARGS__)
/*
- * vrf_table_create
- */
-static void
-vrf_table_create (struct vrf *vrf, afi_t afi, safi_t safi)
-{
- rib_table_info_t *info;
- struct route_table *table;
-
- assert (!vrf->table[afi][safi]);
-
- table = route_table_init ();
- vrf->table[afi][safi] = table;
-
- info = XCALLOC (MTYPE_RIB_TABLE_INFO, sizeof (*info));
- info->vrf = vrf;
- info->afi = afi;
- info->safi = safi;
- table->info = info;
-}
-
-/* Allocate new VRF. */
-static struct vrf *
-vrf_alloc (const char *name)
-{
- struct vrf *vrf;
-
- vrf = XCALLOC (MTYPE_VRF, sizeof (struct vrf));
-
- /* Put name. */
- if (name)
- vrf->name = XSTRDUP (MTYPE_VRF_NAME, name);
-
- /* Allocate routing table and static table. */
- vrf_table_create (vrf, AFI_IP, SAFI_UNICAST);
- vrf_table_create (vrf, AFI_IP6, SAFI_UNICAST);
- vrf->stable[AFI_IP][SAFI_UNICAST] = route_table_init ();
- vrf->stable[AFI_IP6][SAFI_UNICAST] = route_table_init ();
- vrf_table_create (vrf, AFI_IP, SAFI_MULTICAST);
- vrf_table_create (vrf, AFI_IP6, SAFI_MULTICAST);
- vrf->stable[AFI_IP][SAFI_MULTICAST] = route_table_init ();
- vrf->stable[AFI_IP6][SAFI_MULTICAST] = route_table_init ();
-
-
- return vrf;
-}
-
-/* Lookup VRF by identifier. */
-struct vrf *
-vrf_lookup (u_int32_t id)
-{
- return vector_lookup (vrf_vector, id);
-}
-
-/* Initialize VRF. */
-static void
-vrf_init (void)
-{
- struct vrf *default_table;
-
- /* Allocate VRF vector. */
- vrf_vector = vector_init (1);
-
- /* Allocate default main table. */
- default_table = vrf_alloc ("Default-IP-Routing-Table");
-
- /* Default table index must be 0. */
- vector_set_index (vrf_vector, 0, default_table);
-}
-
-/* Lookup route table. */
-struct route_table *
-vrf_table (afi_t afi, safi_t safi, u_int32_t id)
-{
- struct vrf *vrf;
-
- vrf = vrf_lookup (id);
- if (! vrf)
- return NULL;
-
- if( afi >= AFI_MAX || safi >= SAFI_MAX )
- return NULL;
-
- return vrf->table[afi][safi];
-}
-
-/* Lookup static route table. */
-struct route_table *
-vrf_static_table (afi_t afi, safi_t safi, u_int32_t id)
-{
- struct vrf *vrf;
-
- vrf = vrf_lookup (id);
- if (! vrf)
- return NULL;
-
- if( afi >= AFI_MAX || safi >= SAFI_MAX )
- return NULL;
-
- return vrf->stable[afi][safi];
-}
-
-/*
* nexthop_type_to_str
*/
const char *
@@ -473,7 +369,7 @@
p.prefix = nexthop->gate.ipv4;
/* Lookup table. */
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return 0;
@@ -615,7 +511,7 @@
p.prefix = nexthop->gate.ipv6;
/* Lookup table. */
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return 0;
@@ -731,7 +627,7 @@
int recursing;
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -865,7 +761,7 @@
int recursing;
/* Lookup table. */
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return 0;
@@ -922,7 +818,7 @@
int nexthops_active;
/* Lookup table. */
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return ZEBRA_RIB_LOOKUP_ERROR;
@@ -988,7 +884,7 @@
int recursing;
/* Lookup table. */
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return 0;
@@ -1907,7 +1803,7 @@
struct nexthop *nexthop;
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -2071,10 +1967,10 @@
char prefix_buf[INET_ADDRSTRLEN];
/* Lookup table. */
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
{
- zlog_err ("%s: vrf_table() returned NULL", __func__);
+ zlog_err ("%s: zebra_vrf_table() returned NULL", __func__);
return;
}
@@ -2120,9 +2016,9 @@
struct rib *rib;
unsigned changed = 0;
- if (NULL == (table = vrf_table (AFI_IP, SAFI_UNICAST, 0)))
+ if (NULL == (table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT)))
{
- zlog_err ("%s: vrf_table() returned NULL", __func__);
+ zlog_err ("%s: zebra_vrf_table() returned NULL", __func__);
return;
}
@@ -2169,7 +2065,7 @@
struct nexthop *nexthop;
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -2248,7 +2144,7 @@
char buf2[INET_ADDRSTRLEN];
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -2380,7 +2276,7 @@
struct route_table *table;
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return;
@@ -2473,7 +2369,7 @@
struct route_table *table;
/* Lookup table. */
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return;
@@ -2538,7 +2434,7 @@
struct route_table *stable;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP, safi, vrf_id);
+ stable = zebra_vrf_static_table (AFI_IP, safi, vrf_id);
if (! stable)
return -1;
@@ -2629,7 +2525,7 @@
struct route_table *stable;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP, safi, vrf_id);
+ stable = zebra_vrf_static_table (AFI_IP, safi, vrf_id);
if (! stable)
return -1;
@@ -2695,7 +2591,7 @@
struct nexthop *nexthop;
/* Lookup table. */
- table = vrf_table (AFI_IP6, safi, 0);
+ table = zebra_vrf_table (AFI_IP6, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -2806,7 +2702,7 @@
apply_mask_ipv6 (p);
/* Lookup table. */
- table = vrf_table (AFI_IP6, safi, 0);
+ table = zebra_vrf_table (AFI_IP6, safi, VRF_DEFAULT);
if (! table)
return 0;
@@ -2923,7 +2819,7 @@
struct route_node *rn;
/* Lookup table. */
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return;
@@ -3018,7 +2914,7 @@
struct nexthop *nexthop;
/* Lookup table. */
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return;
@@ -3084,7 +2980,7 @@
struct route_table *stable;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP6, SAFI_UNICAST, vrf_id);
+ stable = zebra_vrf_static_table (AFI_IP6, SAFI_UNICAST, vrf_id);
if (! stable)
return -1;
@@ -3169,7 +3065,7 @@
struct route_table *stable;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP6, SAFI_UNICAST, vrf_id);
+ stable = zebra_vrf_static_table (AFI_IP6, SAFI_UNICAST, vrf_id);
if (! stable)
return -1;
@@ -3220,13 +3116,13 @@
struct route_node *rn;
struct route_table *table;
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (table)
for (rn = route_top (table); rn; rn = route_next (rn))
if (rnode_to_ribs (rn))
rib_queue_add (&zebrad, rn);
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (table)
for (rn = route_top (table); rn; rn = route_next (rn))
if (rnode_to_ribs (rn))
@@ -3259,8 +3155,8 @@
void
rib_weed_tables (void)
{
- rib_weed_table (vrf_table (AFI_IP, SAFI_UNICAST, 0));
- rib_weed_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0));
+ rib_weed_table (zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT));
+ rib_weed_table (zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT));
}
/* Delete self installed routes after zebra is relaunched. */
@@ -3293,8 +3189,8 @@
void
rib_sweep_route (void)
{
- rib_sweep_table (vrf_table (AFI_IP, SAFI_UNICAST, 0));
- rib_sweep_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0));
+ rib_sweep_table (zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT));
+ rib_sweep_table (zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT));
}
/* Remove specific by protocol routes from 'table'. */
@@ -3326,8 +3222,8 @@
unsigned long
rib_score_proto (u_char proto)
{
- return rib_score_proto_table (proto, vrf_table (AFI_IP, SAFI_UNICAST, 0))
- +rib_score_proto_table (proto, vrf_table (AFI_IP6, SAFI_UNICAST, 0));
+ return rib_score_proto_table (proto, zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT))
+ +rib_score_proto_table (proto, zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT));
}
/* Close RIB and clean up kernel routes. */
@@ -3357,8 +3253,8 @@
void
rib_close (void)
{
- rib_close_table (vrf_table (AFI_IP, SAFI_UNICAST, 0));
- rib_close_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0));
+ rib_close_table (zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT));
+ rib_close_table (zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT));
}
/* Routing information base initialize. */
@@ -3366,8 +3262,6 @@
rib_init (void)
{
rib_queue_init (&zebrad);
- /* VRF initialization. */
- vrf_init ();
}
/*
@@ -3378,15 +3272,19 @@
* Returns TRUE if a vrf id was found, FALSE otherwise.
*/
static inline int
-vrf_id_get_next (uint32_t id, uint32_t *next_id_p)
+vrf_id_get_next (vrf_id_t vrf_id, vrf_id_t *next_id_p)
{
- while (++id < vector_active (vrf_vector))
+ vrf_iter_t iter = vrf_iterator (vrf_id);
+ struct zebra_vrf *zvrf = vrf_iter2info (iter);
+
+ /* The same one ? Then find out the next. */
+ if (zvrf && (zvrf->vrf_id == vrf_id))
+ zvrf = vrf_iter2info (vrf_next (iter));
+
+ if (zvrf)
{
- if (vrf_lookup (id))
- {
- *next_id_p = id;
- return 1;
- }
+ *next_id_p = zvrf->vrf_id;
+ return 1;
}
return 0;
@@ -3434,7 +3332,7 @@
while (iter->afi_safi_ix < (int) ZEBRA_NUM_OF (afi_safis))
{
- table = vrf_table (afi_safis[iter->afi_safi_ix].afi,
+ table = zebra_vrf_table (afi_safis[iter->afi_safi_ix].afi,
afi_safis[iter->afi_safi_ix].safi,
iter->vrf_id);
if (table)
@@ -3472,3 +3370,79 @@
return table;
}
+
+/*
+ * Create a routing table for the specific AFI/SAFI in the given VRF.
+ */
+static void
+zebra_vrf_table_create (struct zebra_vrf *zvrf, afi_t afi, safi_t safi)
+{
+ rib_table_info_t *info;
+ struct route_table *table;
+
+ assert (!zvrf->table[afi][safi]);
+
+ table = route_table_init ();
+ zvrf->table[afi][safi] = table;
+
+ info = XCALLOC (MTYPE_RIB_TABLE_INFO, sizeof (*info));
+ info->zvrf = zvrf;
+ info->afi = afi;
+ info->safi = safi;
+ table->info = info;
+}
+
+/* Allocate new zebra VRF. */
+struct zebra_vrf *
+zebra_vrf_alloc (vrf_id_t vrf_id)
+{
+ struct zebra_vrf *zvrf;
+
+ zvrf = XCALLOC (MTYPE_ZEBRA_VRF, sizeof (struct zebra_vrf));
+
+ /* Allocate routing table and static table. */
+ zebra_vrf_table_create (zvrf, AFI_IP, SAFI_UNICAST);
+ zebra_vrf_table_create (zvrf, AFI_IP6, SAFI_UNICAST);
+ zvrf->stable[AFI_IP][SAFI_UNICAST] = route_table_init ();
+ zvrf->stable[AFI_IP6][SAFI_UNICAST] = route_table_init ();
+ zebra_vrf_table_create (zvrf, AFI_IP, SAFI_MULTICAST);
+ zebra_vrf_table_create (zvrf, AFI_IP6, SAFI_MULTICAST);
+ zvrf->stable[AFI_IP][SAFI_MULTICAST] = route_table_init ();
+ zvrf->stable[AFI_IP6][SAFI_MULTICAST] = route_table_init ();
+
+ /* Set VRF ID */
+ zvrf->vrf_id = vrf_id;
+
+ return zvrf;
+}
+
+/* Lookup the routing table in an enabled VRF. */
+struct route_table *
+zebra_vrf_table (afi_t afi, safi_t safi, vrf_id_t vrf_id)
+{
+ struct zebra_vrf *zvrf = vrf_info_lookup (vrf_id);
+
+ if (!zvrf)
+ return NULL;
+
+ if (afi >= AFI_MAX || safi >= SAFI_MAX)
+ return NULL;
+
+ return zvrf->table[afi][safi];
+}
+
+/* Lookup the static routing table in a VRF. */
+struct route_table *
+zebra_vrf_static_table (afi_t afi, safi_t safi, vrf_id_t vrf_id)
+{
+ struct zebra_vrf *zvrf = vrf_info_lookup (vrf_id);
+
+ if (!zvrf)
+ return NULL;
+
+ if (afi >= AFI_MAX || safi >= SAFI_MAX)
+ return NULL;
+
+ return zvrf->stable[afi][safi];
+}
+