From 758fb8f99a7bfac3d31c419fd1a5694fc5f33f6a Mon Sep 17 00:00:00 2001 From: Feng Lu Date: Thu, 3 Jul 2014 18:23:09 +0800 Subject: 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 Reviewed-by: Alain Ritoux Signed-off-by: Nicolas Dichtel Acked-by: Donald Sharp --- zebra/rt_netlink.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zebra/rt_netlink.h') diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h index d8f9db85..40fa8eb4 100644 --- a/zebra/rt_netlink.h +++ b/zebra/rt_netlink.h @@ -41,8 +41,8 @@ extern const char * nl_rtproto_to_str (u_char rtproto); -extern int interface_lookup_netlink (void); -extern int netlink_route_read (void); +extern int interface_lookup_netlink (struct zebra_vrf *zvrf); +extern int netlink_route_read (struct zebra_vrf *zvrf); #endif /* HAVE_NETLINK */ -- cgit v1.2.3