diff options
| author | Russ White <russ@riw.us> | 2019-05-16 16:13:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 16:13:26 +0200 |
| commit | ace430f0db312f31e3aa4e925433e9418f74e28a (patch) | |
| tree | 1fa803d8aa4a9e0c2118f768d97766978e870bd9 /pimd | |
| parent | Merge pull request #4269 from donaldsharp/other_tables (diff) | |
| parent | bgpd: do not unregister bfd session when bgp session goes down (diff) | |
| download | frr-ace430f0db312f31e3aa4e925433e9418f74e28a.tar.xz frr-ace430f0db312f31e3aa4e925433e9418f74e28a.zip | |
Merge pull request #4144 from pguibert6WIND/bfd_cbit
BFD CBIT
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_bfd.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c index 300261e5a..87d0f9fa2 100644 --- a/pimd/pim_bfd.c +++ b/pimd/pim_bfd.c @@ -111,6 +111,7 @@ static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command) struct pim_interface *pim_ifp = NULL; struct bfd_info *bfd_info = NULL; struct zclient *zclient = NULL; + int cbit; zclient = pim_zebra_zclient_get(); @@ -127,8 +128,12 @@ static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command) zlog_debug("%s Nbr %s %s with BFD", __PRETTY_FUNCTION__, str, bfd_get_command_dbg_str(command)); } + + cbit = CHECK_FLAG(bfd_info->flags, BFD_FLAG_BFD_CBIT_ON); + bfd_peer_sendmsg(zclient, bfd_info, AF_INET, &nbr->source_addr, NULL, - nbr->interface->name, 0, 0, command, 0, VRF_DEFAULT); + nbr->interface->name, 0, 0, cbit, + command, 0, VRF_DEFAULT); } /* @@ -222,7 +227,8 @@ static int pim_bfd_interface_dest_update(ZAPI_CALLBACK_ARGS) struct listnode *neigh_nextnode = NULL; struct pim_neighbor *neigh = NULL; - ifp = bfd_get_peer_info(zclient->ibuf, &p, NULL, &status, vrf_id); + ifp = bfd_get_peer_info(zclient->ibuf, &p, NULL, &status, + NULL, vrf_id); if ((ifp == NULL) || (p.family != AF_INET)) return 0; |