From a0841732ab9fa76508130086a6e08666e53cc293 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Wed, 27 Jun 2018 13:46:08 -0300 Subject: [PATCH] bgpd/ospf(6)d/pimd: don't show BFD timers When BFD timers are configured, don't show it anymore in the daemon side. This will help us migrate the timers command from daemons to `bfdd`. Signed-off-by: Rafael Zalamena --- bgpd/bgp_bfd.c | 4 ++++ ospf6d/ospf6_bfd.c | 4 ++++ ospfd/ospf_bfd.c | 4 ++++ pimd/pim_bfd.c | 2 ++ 4 files changed, 14 insertions(+) diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index c7d6249870..69ba2b2c11 100644 --- a/bgpd/bgp_bfd.c +++ b/bgpd/bgp_bfd.c @@ -509,9 +509,13 @@ void bgp_bfd_peer_config_write(struct vty *vty, struct peer *peer, char *addr) bfd_info = (struct bfd_info *)peer->bfd_info; if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) +#if HAVE_BFDD > 0 + vty_out(vty, " neighbor %s bfd\n", addr); +#else vty_out(vty, " neighbor %s bfd %d %d %d\n", addr, bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->desired_min_tx); +#endif /* HAVE_BFDD */ if (bfd_info->type != BFD_TYPE_NOT_CONFIGURED) vty_out(vty, " neighbor %s bfd %s\n", addr, diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 7955121365..308229c68f 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -276,11 +276,14 @@ void ospf6_bfd_info_nbr_create(struct ospf6_interface *oi, */ void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi) { +#if HAVE_BFDD == 0 struct bfd_info *bfd_info; +#endif /* ! HAVE_BFDD */ if (!oi->bfd_info) return; +#if HAVE_BFDD == 0 bfd_info = (struct bfd_info *)oi->bfd_info; if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) @@ -288,6 +291,7 @@ void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi) bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->desired_min_tx); else +#endif /* ! HAVE_BFDD */ vty_out(vty, " ipv6 ospf6 bfd\n"); } diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index 0f7fb50778..dcc6c51d20 100644 --- a/ospfd/ospf_bfd.c +++ b/ospfd/ospf_bfd.c @@ -290,17 +290,21 @@ void ospf_bfd_info_nbr_create(struct ospf_interface *oi, void ospf_bfd_write_config(struct vty *vty, struct ospf_if_params *params) { +#if HAVE_BFDD == 0 struct bfd_info *bfd_info; +#endif /* ! HAVE_BFDD */ if (!params->bfd_info) return; +#if HAVE_BFDD == 0 bfd_info = (struct bfd_info *)params->bfd_info; if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) vty_out(vty, " ip ospf bfd %d %d %d\n", bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->desired_min_tx); else +#endif /* ! HAVE_BFDD */ vty_out(vty, " ip ospf bfd\n"); } diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c index 4a3cf715da..f7a217b514 100644 --- a/pimd/pim_bfd.c +++ b/pimd/pim_bfd.c @@ -51,10 +51,12 @@ void pim_bfd_write_config(struct vty *vty, struct interface *ifp) if (!bfd_info) return; +#if HAVE_BFDD == 0 if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) vty_out(vty, " ip pim bfd %d %d %d\n", bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->desired_min_tx); else +#endif /* ! HAVE_BFDD */ vty_out(vty, " ip pim bfd\n"); } -- 2.39.5