zebra, lib/memtypes.c: the netlink sockets work per VRF
This patch lets the netlink sockets work per VRF.
* The definition of "struct nlsock" is moved into zebra/rib.h.
* The previous global variables "netlink" and "netlink_cmd" now
become the members of "struct zebra_vrf", and are initialized
in zebra_vrf_alloc().
* All relative functions now work for a specific VRF, by adding
a new parameter which specifies the working VRF, except those
functions in which the VRF ID can be obtained from the interface.
* kernel_init(), interface_list() and route_read() are now also
working per VRF, and moved from main() to zebra_vrf_enable().
* A new function kernel_terminate() is added to release the
netlink sockets. It is called from zebra_vrf_disable().
* Correct VRF ID, instead of the previous VRF_DEFAULT, are now
passed to the functions of processing interfaces or route
entries.
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: Donald Sharp <sharpd@cumulusnetworks.com>
diff --git a/zebra/main.c b/zebra/main.c
index 08cc247..c5d1d76 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -232,6 +232,10 @@
#ifdef RTADV
rtadv_init (zvrf);
#endif
+ kernel_init (zvrf);
+ interface_list (zvrf);
+ route_read (zvrf);
+
return 0;
}
@@ -259,6 +263,7 @@
#ifdef RTADV
rtadv_terminate (zvrf);
#endif
+ kernel_terminate (zvrf);
list_delete_all_node (zvrf->rid_all_sorted_list);
list_delete_all_node (zvrf->rid_lo_sorted_list);
@@ -412,9 +417,6 @@
/* Initialize VRF module, and make kernel routing socket. */
zebra_vrf_init ();
- kernel_init ();
- interface_list ();
- route_read ();
#ifdef HAVE_SNMP
zebra_snmp_init ();