From e763afa5072e3c39f0caa2fe44472c2d70830144 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 13 Jun 2017 14:36:55 +0200 Subject: [PATCH] babeld/eigrpd: flip VTY ports & fix rpm babeld was 2609 previously, and this was still marked in SERVICES. Let's flip it back before we have a release out with it. Signed-off-by: David Lamparter --- SERVICES | 3 ++- babeld/babeld.h | 2 +- eigrpd/eigrp_const.h | 2 +- redhat/frr.spec.in | 24 +++++++++++++++++++++--- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/SERVICES b/SERVICES index 50c79391d7..f7f92a736b 100644 --- a/SERVICES +++ b/SERVICES @@ -17,7 +17,8 @@ bgpd 2605/tcp ospf6d 2606/tcp ospfapi 2607/tcp isisd 2608/tcp -# babeld 2609/tcp +babeld 2609/tcp nhrpd 2610/tcp pimd 2611/tcp ldpd 2612/tcp +eigrpd 2613/tcp diff --git a/babeld/babeld.h b/babeld/babeld.h index 4dd9ebe785..d933f18805 100644 --- a/babeld/babeld.h +++ b/babeld/babeld.h @@ -88,7 +88,7 @@ THE SOFTWARE. #endif -#define BABEL_VTY_PORT 2613 +#define BABEL_VTY_PORT 2609 #define BABEL_DEFAULT_CONFIG "babeld.conf" #define BABEL_VERSION "0.1 for quagga" diff --git a/eigrpd/eigrp_const.h b/eigrpd/eigrp_const.h index 6673b3a334..8133587579 100644 --- a/eigrpd/eigrp_const.h +++ b/eigrpd/eigrp_const.h @@ -81,7 +81,7 @@ #define EIGRP_IP_TTL 1 /* VTY port number. */ -#define EIGRP_VTY_PORT 2609 +#define EIGRP_VTY_PORT 2613 /* Default configuration file name for eigrp. */ #define EIGRP_DEFAULT_CONFIG "eigrpd.conf" diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index fea80d7f72..71ee307c96 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -19,6 +19,7 @@ %{!?with_ldpd: %global with_ldpd 1 } %{!?with_nhrpd: %global with_nhrpd 1 } %{!?with_eigrpd: %global with_eigrpd 1 } +%{!?with_babeld: %global with_babeld 1 } %{!?with_shared: %global with_shared 1 } %{!?with_multipath: %global with_multipath 256 } %{!?frr_user: %global frr_user frr } @@ -108,13 +109,19 @@ %define daemon_eigrpd "" %endif +%if %{with_babeld} +%define daemon_babeld babeld +%else +%define daemon_babeld "" +%endif + %if %{with_watchfrr} %define daemon_watchfrr watchfrr %else %define daemon_watchfrr "" %endif -%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_watchfrr} +%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} # allow build dir to be kept %{!?keep_build: %global keep_build 0 } @@ -261,6 +268,11 @@ developing OSPF-API and frr applications. %else --disable-eigrpd \ %endif +%if %{with_babeld} + --enable-babeld \ +%else + --disable-babeld \ +%endif %if %{with_pam} --with-libpam \ %endif @@ -382,8 +394,8 @@ zebra_spec_add_service ospf6d 2606/tcp "OSPF6d vty" zebra_spec_add_service ospfapi 2607/tcp "OSPF-API" %endif zebra_spec_add_service isisd 2608/tcp "ISISd vty" -%if %{with_eigrpd} -zebra_spec_add_service eigrpd 2609/tcp "EIGRPd vty" +%if %{with_babeld} +zebra_spec_add_service babeld 2609/tcp "BABELd vty" %endif %if %{with_nhrpd} zebra_spec_add_service nhrpd 2610/tcp "NHRPd vty" @@ -394,6 +406,9 @@ zebra_spec_add_service pimd 2611/tcp "PIMd vty" %if %{with_ldpd} zebra_spec_add_service ldpd 2612/tcp "LDPd vty" %endif +%if %{with_eigrpd} +zebra_spec_add_service eigrpd 2613/tcp "EIGRPd vty" +%endif %if "%{initsystem}" == "systemd" for daemon in %all_daemons ; do @@ -532,6 +547,9 @@ rm -rf %{buildroot} %if %{with_nhrpd} %{_sbindir}/nhrpd %endif +%if %{with_babeld} + %{_sbindir}/babeld +%endif %if %{with_shared} %{_libdir}/lib*.so %{_libdir}/lib*.so.0 -- 2.39.5