Skip to content

Commit

Permalink
zebra, build: disable irdp by default
Browse files Browse the repository at this point in the history
IRDP client (rdisc) was deleted from iputils more than 2 years ago. It's
time to drop IRDP, but first let's stop building and including it in the
packages by default to see if anyone will be complaining.

Signed-off-by: Igor Ryzhov <[email protected]>
  • Loading branch information
idryzhov committed Jan 28, 2024
1 parent 259e3d4 commit def695f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ AC_ARG_ENABLE([realms],
AC_ARG_ENABLE([rtadv],
AS_HELP_STRING([--disable-rtadv], [disable IPV6 router advertisement feature]))
AC_ARG_ENABLE([irdp],
AS_HELP_STRING([--disable-irdp], [disable IRDP server support in zebra (enabled by default if supported)]))
AS_HELP_STRING([--enable-irdp], [enable IRDP server support in zebra]))
AC_ARG_ENABLE([capabilities],
AS_HELP_STRING([--disable-capabilities], [disable using POSIX capabilities]))
AC_ARG_ENABLE([gcc_ultra_verbose],
Expand Down Expand Up @@ -2334,6 +2334,9 @@ yes)
no)
IRDP=false
;;
*)
IRDP=false
;;
esac


Expand Down
1 change: 0 additions & 1 deletion debian/frr.install
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ usr/lib/*/frr/modules/bgpd_bmp.so
usr/lib/*/frr/modules/dplane_fpm_nl.so
usr/lib/*/frr/modules/zebra_cumulus_mlag.so
usr/lib/*/frr/modules/zebra_fpm.so
usr/lib/*/frr/modules/zebra_irdp.so
usr/lib/*/frr/modules/pathd_pcep.so
usr/lib/frr/*.sh
usr/lib/frr/*d
Expand Down
5 changes: 2 additions & 3 deletions doc/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,9 @@ options from the list below.
assigned to the realm. See the tc man page. This option is currently not
compatible with the usage of nexthop groups in the linux kernel itself.

.. option:: --disable-irdp
.. option:: --enable-irdp

Disable IRDP server support. This is enabled by default if we have
both `struct in_pktinfo` and `struct icmphdr` available to us.
Enable IRDP server support. This is deprecated.

.. option:: --disable-rtadv

Expand Down
2 changes: 0 additions & 2 deletions redhat/frr.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ routing state through standard SNMP MIBs.
--localstatedir=%{_localstatedir} \
--disable-static \
--disable-werror \
--enable-irdp \
%if %{with_multipath}
--enable-multipath=%{with_multipath} \
%endif
Expand Down Expand Up @@ -717,7 +716,6 @@ fi
%endif
%{_libdir}/frr/modules/zebra_cumulus_mlag.so
%{_libdir}/frr/modules/dplane_fpm_nl.so
%{_libdir}/frr/modules/zebra_irdp.so
%{_libdir}/frr/modules/bgpd_bmp.so
%{_libdir}/libfrr_pb.so*
%{_libdir}/libfrrfpm_pb.so*
Expand Down
1 change: 0 additions & 1 deletion snapcraft/snapcraft.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ parts:
- --enable-ospfapi=yes
- --enable-multipath=64
- --enable-rtadv
- --enable-irdp
- --enable-user=root
- --enable-group=root
- --enable-pimd
Expand Down

0 comments on commit def695f

Please sign in to comment.