proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 07:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd/ospf(6)d/pimd: don't show BFD timers

Browse Source 
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 <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2018-06-27 13:46:08 -03:00
parent d3af6147a1
commit a0841732ab
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_bfd.c
View File

@ -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; bfd_info = (struct bfd_info *)peer->bfd_info;
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) 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, vty_out(vty, " neighbor %s bfd %d %d %d\n", addr,
bfd_info->detect_mult, bfd_info->required_min_rx, bfd_info->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx); bfd_info->desired_min_tx);
#endif /* HAVE_BFDD */
if (bfd_info->type != BFD_TYPE_NOT_CONFIGURED) if (bfd_info->type != BFD_TYPE_NOT_CONFIGURED)
vty_out(vty, " neighbor %s bfd %s\n", addr, vty_out(vty, " neighbor %s bfd %s\n", addr,

4
ospf6d/ospf6_bfd.c
View File

@ -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) void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi)
{ {
#if HAVE_BFDD == 0
struct bfd_info *bfd_info; struct bfd_info *bfd_info;
#endif /* ! HAVE_BFDD */
if (!oi->bfd_info) if (!oi->bfd_info)
return; return;
#if HAVE_BFDD == 0
bfd_info = (struct bfd_info *)oi->bfd_info; bfd_info = (struct bfd_info *)oi->bfd_info;
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) 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->detect_mult, bfd_info->required_min_rx,
bfd_info->desired_min_tx); bfd_info->desired_min_tx);
else else
#endif /* ! HAVE_BFDD */
vty_out(vty, " ipv6 ospf6 bfd\n"); vty_out(vty, " ipv6 ospf6 bfd\n");
} }

4
ospfd/ospf_bfd.c
View File

@ -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) void ospf_bfd_write_config(struct vty *vty, struct ospf_if_params *params)
{ {
#if HAVE_BFDD == 0
struct bfd_info *bfd_info; struct bfd_info *bfd_info;
#endif /* ! HAVE_BFDD */
if (!params->bfd_info) if (!params->bfd_info)
return; return;
#if HAVE_BFDD == 0
bfd_info = (struct bfd_info *)params->bfd_info; bfd_info = (struct bfd_info *)params->bfd_info;
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
vty_out(vty, " ip ospf bfd %d %d %d\n", bfd_info->detect_mult, vty_out(vty, " ip ospf bfd %d %d %d\n", bfd_info->detect_mult,
bfd_info->required_min_rx, bfd_info->desired_min_tx); bfd_info->required_min_rx, bfd_info->desired_min_tx);
else else
#endif /* ! HAVE_BFDD */
vty_out(vty, " ip ospf bfd\n"); vty_out(vty, " ip ospf bfd\n");
} }

2
pimd/pim_bfd.c
View File

@ -51,10 +51,12 @@ void pim_bfd_write_config(struct vty *vty, struct interface *ifp)
if (!bfd_info) if (!bfd_info)
return; return;
#if HAVE_BFDD == 0
if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
vty_out(vty, " ip pim bfd %d %d %d\n", bfd_info->detect_mult, vty_out(vty, " ip pim bfd %d %d %d\n", bfd_info->detect_mult,
bfd_info->required_min_rx, bfd_info->desired_min_tx); bfd_info->required_min_rx, bfd_info->desired_min_tx);
else else
#endif /* ! HAVE_BFDD */
vty_out(vty, " ip pim bfd\n"); vty_out(vty, " ip pim bfd\n");
} }