diff options
| -rw-r--r-- | zebra/rtadv.c | 34 | ||||
| -rw-r--r-- | zebra/zapi_msg.c | 5 |
2 files changed, 29 insertions, 10 deletions
diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 013eb5819c..fa0a682d07 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -46,14 +46,14 @@ #include "zebra/zebra_errors.h" #include "zebra/zebra_router.h" -#ifndef VTYSH_EXTRACT_PL -#include "zebra/rtadv_clippy.c" -#endif - extern struct zebra_privs_t zserv_privs; #if defined(HAVE_RTADV) +#ifndef VTYSH_EXTRACT_PL +#include "zebra/rtadv_clippy.c" +#endif + DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix") #ifdef OPEN_BSD @@ -2648,7 +2648,7 @@ void rtadv_init(struct zebra_vrf *zvrf) { /* Empty.*/; } -void rtadv_terminate(struct zebra_vrf *zvrf) +void rtadv_terminate(void) { /* Empty.*/; } @@ -2677,4 +2677,28 @@ void rtadv_stop_ra_all(void) /* Empty.*/; } +/* + * If the end user does not have RADV enabled we should + * handle this better + */ +void zebra_interface_radv_disable(ZAPI_HANDLER_ARGS) +{ + if (IS_ZEBRA_DEBUG_PACKET) + zlog_debug( + "Received %s command, but ZEBRA is not compiled with Router Advertisements on", + zserv_command_string(hdr->command)); + + return; +} + +void zebra_interface_radv_enable(ZAPI_HANDLER_ARGS) +{ + if (IS_ZEBRA_DEBUG_PACKET) + zlog_debug( + "Received %s command, but ZEBRA is not compiled with Router Advertisements on", + zserv_command_string(hdr->command)); + + return; +} + #endif /* HAVE_RTADV */ diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 5db4555284..ffe5ca4845 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -2829,13 +2829,8 @@ void (*const zserv_handlers[])(ZAPI_HANDLER_ARGS) = { [ZEBRA_VRF_UNREGISTER] = zread_vrf_unregister, [ZEBRA_VRF_LABEL] = zread_vrf_label, [ZEBRA_BFD_CLIENT_REGISTER] = zebra_ptm_bfd_client_register, -#if defined(HAVE_RTADV) [ZEBRA_INTERFACE_ENABLE_RADV] = zebra_interface_radv_enable, [ZEBRA_INTERFACE_DISABLE_RADV] = zebra_interface_radv_disable, -#else - [ZEBRA_INTERFACE_ENABLE_RADV] = NULL, - [ZEBRA_INTERFACE_DISABLE_RADV] = NULL, -#endif [ZEBRA_MPLS_LABELS_ADD] = zread_mpls_labels_add, [ZEBRA_MPLS_LABELS_DELETE] = zread_mpls_labels_delete, [ZEBRA_MPLS_LABELS_REPLACE] = zread_mpls_labels_replace, |