proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 20:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian, config, zebra: Ensure Cumulus Extensions are not auto turned on

Browse Source 
There exist cases where Cumulus Code( in this case code surrounding
when we want to send Router Advertisements ) should only be
turned on for Cumulus Switches.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-02-21 12:43:50 -05:00
parent 3e66be2ee6
commit 000cf1fb35
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -302,6 +302,8 @@ AC_ARG_ENABLE(systemd,
[ --enable-systemd enable Systemd support]) [ --enable-systemd enable Systemd support])
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)])) AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)]))
AC_ARG_ENABLE(cumulus,
[ --enable-cumulus enable Cumulus Switch Special Extensions])
if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes" CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"
@ -329,6 +331,10 @@ if test "${enable_systemd}" = "yes" ; then
LIBS="$LIBS -lsystemd " LIBS="$LIBS -lsystemd "
fi fi
if test "${enable_cumulus}" = "yes" ; then
AC_DEFINE(HAVE_CUMULUS,,Compile Special Cumulus Code in)
fi
if test "${enable_shell_access}" = "yes"; then if test "${enable_shell_access}" = "yes"; then
AC_DEFINE(HAVE_SHELL_ACCESS,,Allow user to use ssh/telnet/bash) AC_DEFINE(HAVE_SHELL_ACCESS,,Allow user to use ssh/telnet/bash)
fi fi

1
debian/rules vendored
View File

@ -67,6 +67,7 @@ override_dh_auto_configure:
--enable-gcc-rdynamic \ --enable-gcc-rdynamic \
--with-libpam \ --with-libpam \
--enable-systemd=yes \ --enable-systemd=yes \
--enable-cumulus=yes \
--enable-dependency-tracking; \ --enable-dependency-tracking; \
fi fi
if ! diff -b -IHAVE_SNMP -IHAVE_NETSNMP -IUCD_COMPAT -IGETIFADDR debian/my/config.h.reference config.h; then \ if ! diff -b -IHAVE_SNMP -IHAVE_NETSNMP -IUCD_COMPAT -IGETIFADDR debian/my/config.h.reference config.h; then \

2
zebra/rtadv.h
View File

@ -116,10 +116,12 @@ static inline int
interface_ipv6_auto_ra_allowed (struct interface *ifp) interface_ipv6_auto_ra_allowed (struct interface *ifp)
{ {
#if defined (HAVE_RTADV) #if defined (HAVE_RTADV)
#if defined (HAVE_CUMULUS)
if ((strncmp (ifp->name, "eth", strlen("eth")) == 0) || if ((strncmp (ifp->name, "eth", strlen("eth")) == 0) ||
(strncmp (ifp->name, "lo", strlen("lo")) == 0) || (strncmp (ifp->name, "lo", strlen("lo")) == 0) ||
(strncmp (ifp->name, "switch", strlen("switch")) == 0)) (strncmp (ifp->name, "switch", strlen("switch")) == 0))
return 0; return 0;
#endif
return 1; return 1;
#else #else
return 0; return 0;