diff options
| author | Feng Lu <lu.feng@6wind.com> | 2014-07-03 12:23:09 +0200 |
|---|---|---|
| committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 09:45:21 +0100 |
| commit | 8f7d9fc0883869bb32f67b4f70f017141d412ccb (patch) | |
| tree | 0fcdf5979c2e3ebae576c3d14843827cc1c387a9 /zebra/if_sysctl.c | |
| parent | zebra: maintain RTADV per VRF (diff) | |
| download | frr-8f7d9fc0883869bb32f67b4f70f017141d412ccb.tar.xz frr-8f7d9fc0883869bb32f67b4f70f017141d412ccb.zip | |
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/if_sysctl.c')
| -rw-r--r-- | zebra/if_sysctl.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/zebra/if_sysctl.c b/zebra/if_sysctl.c index 1150ec1b0..e7b25d1f8 100644 --- a/zebra/if_sysctl.c +++ b/zebra/if_sysctl.c @@ -29,9 +29,15 @@ #include "memory.h" #include "ioctl.h" #include "log.h" +<<<<<<< HEAD +======= +#include "interface.h" +#include "vrf.h" +>>>>>>> 3c27b5f... zebra, lib/memtypes.c: the netlink sockets work per VRF #include "zebra/rt.h" #include "zebra/kernel_socket.h" +#include "zebra/rib.h" void ifstat_update_sysctl (void) @@ -90,7 +96,7 @@ ifstat_update_sysctl (void) /* Interface listing up function using sysctl(). */ void -interface_list () +interface_list (struct zebra_vrf *zvrf) { caddr_t ref, buf, end; size_t bufsiz; @@ -107,6 +113,12 @@ interface_list () 0 }; + if (zvrf->vrf_id != VRF_DEFAULT) + { + zlog_warn ("interface_list: ignore VRF %u", zvrf->vrf_id); + return; + } + /* Query buffer size. */ if (sysctl (mib, MIBSIZ, NULL, &bufsiz, NULL, 0) < 0) { |