From aa5c758b06acbd2179b7b6232b6a9f64c250b22c Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Tue, 18 May 2021 23:31:52 +0300 Subject: [PATCH] bgpd: fix zebra bfd registration If there's no default router configured at the moment when bgpd is connected to zebra, bgpd is not registered as a BFD client. We should do the registration regardless of the config existence. Signed-off-by: Igor Ryzhov --- bgpd/bgp_zebra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 63214c5676..2bf57130be 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -2609,6 +2609,9 @@ static void bgp_zebra_connected(struct zclient *zclient) zclient_num_connects++; /* increment even if not responding */ + /* Send the client registration */ + bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, VRF_DEFAULT); + /* At this point, we may or may not have BGP instances configured, but * we're only interested in the default VRF (others wouldn't have learnt * the VRF from Zebra yet.) @@ -2619,9 +2622,6 @@ static void bgp_zebra_connected(struct zclient *zclient) bgp_zebra_instance_register(bgp); - /* Send the client registration */ - bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, bgp->vrf_id); - /* tell label pool that zebra is connected */ bgp_lp_event_zebra_up(); -- 2.39.5