summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvneesh Sachdev <avneesh@opensourcerouting.org>2012-11-13 22:48:54 +0000
committerDavid Lamparter <equinox@opensourcerouting.org>2012-11-30 21:41:16 +0100
commit1b5ed1b054b955275bb7cf0f80fb7767094bc28b (patch)
treeb8d886b85615f1b05679e6879c961e5dcb1496c4
parent9fd92e3c4bdcc78e0f0d94d53a2d4c7b0e893fcb (diff)
zebra: add way to determine VRF/AFI/SAFI of table
Add some code that allows us to determine which VRF and AFI/SAFI a given RIB table corresponds to. * zebra/rib.h Add rib_table_info_t structure, which contains information about the VRF, AFI and SAFI that a table is for. * zebra/zebra_rib.c - Add the vrf_table_create() function, which creates a table and sets its 'info' pointer to a newly created rib_table_info_t. The 'info' pointer allows us to go from a route_node or a table to the associated vrf. - vrf_alloc(): Use vrf_create_table() to create tables. * lib/memtypes.c Add memory type for rib_table_info_t. Signed-off-by: Avneesh Sachdev <avneesh@opensourcerouting.org> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
-rw-r--r--lib/memtypes.c1
-rw-r--r--zebra/rib.h36
-rw-r--r--zebra/zebra_rib.c29
3 files changed, 62 insertions, 4 deletions
diff --git a/lib/memtypes.c b/lib/memtypes.c
index 76dece29..50b6fa42 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -83,6 +83,7 @@ struct memory_list memory_list_zebra[] =
{ MTYPE_STATIC_IPV4, "Static IPv4 route" },
{ MTYPE_STATIC_IPV6, "Static IPv6 route" },
{ MTYPE_RIB_DEST, "RIB destination" },
+ { MTYPE_RIB_TABLE_INFO, "RIB table info" },
{ -1, NULL },
};
diff --git a/zebra/rib.h b/zebra/rib.h
index 084f3516..c98d99a4 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -268,6 +268,24 @@ struct vrf
struct route_table *stable[AFI_MAX][SAFI_MAX];
};
+/*
+ * rib_table_info_t
+ *
+ * Structure that is hung off of a route_table that holds information about
+ * the table.
+ */
+typedef struct rib_table_info_t_
+{
+
+ /*
+ * Back pointer to vrf.
+ */
+ struct vrf *vrf;
+ afi_t afi;
+ safi_t safi;
+
+} rib_table_info_t;
+
extern struct nexthop *nexthop_ifindex_add (struct rib *, unsigned int);
extern struct nexthop *nexthop_ifname_add (struct rib *, char *);
extern struct nexthop *nexthop_blackhole_add (struct rib *);
@@ -362,6 +380,15 @@ extern int rib_gc_dest (struct route_node *rn);
*/
/*
+ * rib_table_info
+ */
+static inline rib_table_info_t *
+rib_table_info (struct route_table *table)
+{
+ return (rib_table_info_t *) table->info;
+}
+
+/*
* rib_dest_from_rnode
*/
static inline rib_dest_t *
@@ -417,4 +444,13 @@ rib_dest_table (rib_dest_t *dest)
return dest->rnode->table;
}
+/*
+ * rib_dest_vrf
+ */
+static inline struct vrf *
+rib_dest_vrf (rib_dest_t *dest)
+{
+ return rib_table_info (rib_dest_table (dest))->vrf;
+}
+
#endif /*_ZEBRA_RIB_H */
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index f0d5c9d9..2cbee935 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -74,6 +74,27 @@ static const struct
/* Vector for routing table. */
static vector vrf_vector;
+/*
+ * 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)
@@ -87,12 +108,12 @@ vrf_alloc (const char *name)
vrf->name = XSTRDUP (MTYPE_VRF_NAME, name);
/* Allocate routing table and static table. */
- vrf->table[AFI_IP][SAFI_UNICAST] = route_table_init ();
- vrf->table[AFI_IP6][SAFI_UNICAST] = route_table_init ();
+ 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[AFI_IP][SAFI_MULTICAST] = route_table_init ();
- vrf->table[AFI_IP6][SAFI_MULTICAST] = 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 ();