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_vty.c b/zebra/zebra_vty.c
index bc453de..a4e6af7 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -27,6 +27,7 @@
#include "command.h"
#include "table.h"
#include "rib.h"
+#include "vrf.h"
#include "zebra/zserv.h"
@@ -989,7 +990,7 @@
struct rib *rib;
int first = 1;
- table = vrf_table (AFI_IP, safi, 0);
+ table = zebra_vrf_table (AFI_IP, safi, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1030,7 +1031,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1063,7 +1064,7 @@
u_int32_t addr;
int first = 1;
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1109,7 +1110,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1148,7 +1149,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1186,7 +1187,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1359,7 +1360,7 @@
{
struct route_table *table;
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1380,7 +1381,7 @@
{
struct route_table *table;
- table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1402,7 +1403,7 @@
write = 0;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP, safi, 0);
+ stable = zebra_vrf_static_table (AFI_IP, safi, VRF_DEFAULT);
if (! stable)
return -1;
@@ -1489,7 +1490,7 @@
struct rib *rib;
int first = 1;
- table = vrf_table (AFI_IP, SAFI_MULTICAST, 0);
+ table = zebra_vrf_table (AFI_IP, SAFI_MULTICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1826,7 +1827,7 @@
struct rib *rib;
int first = 1;
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1860,7 +1861,7 @@
int ret;
int first = 1;
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1907,7 +1908,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1946,7 +1947,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -1984,7 +1985,7 @@
return CMD_WARNING;
}
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -2015,7 +2016,7 @@
{
struct route_table *table;
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -2036,7 +2037,7 @@
{
struct route_table *table;
- table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -2062,7 +2063,7 @@
struct rib *rib;
int first = 1;
- table = vrf_table (AFI_IP6, SAFI_MULTICAST, 0);
+ table = zebra_vrf_table (AFI_IP6, SAFI_MULTICAST, VRF_DEFAULT);
if (! table)
return CMD_SUCCESS;
@@ -2093,7 +2094,7 @@
write = 0;
/* Lookup table. */
- stable = vrf_static_table (AFI_IP6, SAFI_UNICAST, 0);
+ stable = zebra_vrf_static_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT);
if (! stable)
return -1;