diff options
| author | Feng Lu <lu.feng@6wind.com> | 2014-07-03 18:23:09 +0800 |
|---|---|---|
| committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 01:45:21 -0700 |
| commit | 8f7d9fc0883869bb32f67b4f70f017141d412ccb (patch) | |
| tree | 0fcdf5979c2e3ebae576c3d14843827cc1c387a9 /zebra/main.c | |
| parent | cd80d74fb275fe68247891d071075f450d4ec41c (diff) | |
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>
Conflicts:
lib/memtypes.c
zebra/rib.h
zebra/rt_netlink.c
Conflicts:
zebra/if_netlink.c
zebra/if_sysctl.c
zebra/kernel_null.c
zebra/rib.h
zebra/rt_netlink.c
zebra/rt_netlink.h
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/zebra/main.c b/zebra/main.c index 16a11edea3..4b2a89856e 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -241,6 +241,10 @@ zebra_vrf_enable (vrf_id_t vrf_id, void **info) #ifdef RTADV rtadv_init (zvrf); #endif + kernel_init (zvrf); + interface_list (zvrf); + route_read (zvrf); + return 0; } @@ -268,6 +272,7 @@ zebra_vrf_disable (vrf_id_t vrf_id, void **info) #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); @@ -428,9 +433,6 @@ main (int argc, char **argv) /* Initialize VRF module, and make kernel routing socket. */ zebra_vrf_init (); - kernel_init (); - interface_list (); - route_read (); #ifdef HAVE_SNMP zebra_snmp_init (); |