Merge pull request #5280 from qlyoung/doc-clean-topotest-json

[mirror_frr.git] / ospf6d / ospf6_bfd.c

diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c
index 3394bd75db854706db7c2ce821dc8fe4ea7199ba..4e7a0050aa26227776ed97ee4043b8f78b341c44 100644 (file)
--- a/ospf6d/ospf6_bfd.c
+++ b/ospf6d/ospf6_bfd.c
@@ -74,6 +74,7 @@ void ospf6_bfd_reg_dereg_nbr(struct ospf6_neighbor *on, int command)
        struct interface *ifp = oi->interface;
        struct bfd_info *bfd_info;
        char src[64];
+       int cbit;
 
        if (!oi->bfd_info || !on->bfd_info)
                return;
@@ -85,9 +86,11 @@ void ospf6_bfd_reg_dereg_nbr(struct ospf6_neighbor *on, int command)
                           bfd_get_command_dbg_str(command), src);
        }
 
+       cbit = CHECK_FLAG(bfd_info->flags, BFD_FLAG_BFD_CBIT_ON);
+
        bfd_peer_sendmsg(zclient, bfd_info, AF_INET6, &on->linklocal_addr,
-                        on->ospf6_if->linklocal_addr, ifp->name, 0, 0, command,
-                        0, VRF_DEFAULT);
+                        on->ospf6_if->linklocal_addr, ifp->name, 0, 0,
+                        cbit, command, 0, VRF_DEFAULT);
 
        if (command == ZEBRA_BFD_DEST_DEREGISTER)
                bfd_info_free((struct bfd_info **)&on->bfd_info);
@@ -151,7 +154,7 @@ static int ospf6_bfd_nbr_replay(ZAPI_CALLBACK_ARGS)
                zlog_debug("Zebra: BFD Dest replay request");
 
        /* Send the client registration */
-       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER);
+       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, vrf_id);
 
        /* Replay the neighbor, if BFD is enabled on the interface*/
        FOR_ALL_INTERFACES (vrf, ifp) {
@@ -195,7 +198,8 @@ static int ospf6_bfd_interface_dest_update(ZAPI_CALLBACK_ARGS)
        struct bfd_info *bfd_info;
        struct timeval tv;
 
-       ifp = bfd_get_peer_info(zclient->ibuf, &dp, &sp, &status, vrf_id);
+       ifp = bfd_get_peer_info(zclient->ibuf, &dp, &sp, &status,
+                               NULL, vrf_id);
 
        if ((ifp == NULL) || (dp.family != AF_INET6))
                return 0;
@@ -232,7 +236,7 @@ static int ospf6_bfd_interface_dest_update(ZAPI_CALLBACK_ARGS)
                        continue;
 
                old_status = bfd_info->status;
-               bfd_info->status = status;
+               BFD_SET_CLIENT_STATUS(bfd_info->status, status);
                monotime(&tv);
                bfd_info->last_update = tv.tv_sec;