diff options
| author | Feng Lu <lu.feng@6wind.com> | 2015-05-22 11:40:10 +0200 |
|---|---|---|
| committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 08:57:27 +0100 |
| commit | cd80d74fb275fe68247891d071075f450d4ec41c (patch) | |
| tree | f9d14517c439e1971a11402ef64f832be828271e /zebra/interface.h | |
| parent | zebra: add hooks upon enabling / disabling a VRF (diff) | |
| download | frr-cd80d74fb275fe68247891d071075f450d4ec41c.tar.xz frr-cd80d74fb275fe68247891d071075f450d4ec41c.zip | |
zebra: maintain RTADV per VRF
This moves the global variable "rtadv" into the "struct zebra_vrf",
so that RTADV feature can work per VRF.
* rtadv.c/rtadv.h:
Add a proper parameter to the functions so that the entity of the
"struct zebra_vrf" and interfaces can be obtained from the specified
VRF.
The old rtadv_init() is splitted into:
- rtadv_cmd_init(): it installs the RTADV commands; is called from
main();
- new rtadv_init(): it creates the socket; is called from
zebra_vrf_enable().
rtadv_terminate() is added to stop the threads, close the socket and
clear the counters. It is called from zebra_vrf_disable().
rtadv_make_socket() now calls vrf_socket() to create a socket in
the VRF.
* interface.h and rib.h: define the macro RTADV.
* main.c: according changes, refer to rtadv.c.
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>
Conflicts:
zebra/interface.h
zebra/rib.h
zebra/rtadv.c
zebra/rtadv.h
Diffstat (limited to 'zebra/interface.h')
| -rw-r--r-- | zebra/interface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/zebra/interface.h b/zebra/interface.h index e8456ce59..ba76d3e84 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -38,11 +38,13 @@ #define IF_ZEBRA_SHUTDOWN_ON 1 /* Router advertisement feature. */ +#ifndef RTADV #if (defined(LINUX_IPV6) && (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1)) || defined(KAME) #ifdef HAVE_RTADV #define RTADV #endif #endif +#endif #ifdef RTADV /* Router advertisement parameter. From RFC4861, RFC6275 and RFC4191. */ |