proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 22:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #696 from donaldsharp/disable_rtadv

Browse Source 
zebra: Fix --disable-rtadv to actually compile
This commit is contained in:
Jafar Al-Gharaibeh 2017-06-08 09:48:00 -05:00 committed by GitHub
commit e676bf62a8
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/interface.c
View File

@ -849,6 +849,7 @@ if_up (struct interface *ifp)
if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (ifp); if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (ifp);
#if defined (HAVE_RTADV)
/* Enable fast tx of RA if enabled && RA interval is not in msecs */ /* Enable fast tx of RA if enabled && RA interval is not in msecs */
if (zif->rtadv.AdvSendAdvertisements && if (zif->rtadv.AdvSendAdvertisements &&
(zif->rtadv.MaxRtrAdvInterval >= 1000)) (zif->rtadv.MaxRtrAdvInterval >= 1000))
@ -856,6 +857,7 @@ if_up (struct interface *ifp)
zif->rtadv.inFastRexmit = 1; zif->rtadv.inFastRexmit = 1;
zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS; zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS;
} }
#endif
/* Install connected routes to the kernel. */ /* Install connected routes to the kernel. */
if_install_connected (ifp); if_install_connected (ifp);

2
zebra/misc_null.c
View File

@ -25,7 +25,9 @@
#include "zebra/irdp.h" #include "zebra/irdp.h"
#include "zebra/interface.h" #include "zebra/interface.h"
#if defined (HAVE_RTADV)
void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; } void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; }
#endif
void irdp_config_write (struct vty *vty, struct interface *ifp) { return; } void irdp_config_write (struct vty *vty, struct interface *ifp) { return; }
#ifdef HAVE_PROC_NET_DEV #ifdef HAVE_PROC_NET_DEV
void ifstat_update_proc (void) { return; } void ifstat_update_proc (void) { return; }

4
zebra/zserv.c
View File

@ -2396,10 +2396,14 @@ zebra_client_read (struct thread *thread)
zebra_ptm_bfd_client_register(client, sock, length); zebra_ptm_bfd_client_register(client, sock, length);
break; break;
case ZEBRA_INTERFACE_ENABLE_RADV: case ZEBRA_INTERFACE_ENABLE_RADV:
#if defined (HAVE_RTADV)
zebra_interface_radv_set (client, sock, length, zvrf, 1); zebra_interface_radv_set (client, sock, length, zvrf, 1);
#endif
break; break;
case ZEBRA_INTERFACE_DISABLE_RADV: case ZEBRA_INTERFACE_DISABLE_RADV:
#if defined (HAVE_RTADV)
zebra_interface_radv_set (client, sock, length, zvrf, 0); zebra_interface_radv_set (client, sock, length, zvrf, 0);
#endif
break; break;
case ZEBRA_MPLS_LABELS_ADD: case ZEBRA_MPLS_LABELS_ADD:
case ZEBRA_MPLS_LABELS_DELETE: case ZEBRA_MPLS_LABELS_DELETE: