From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 4 Feb 2019 17:22:55 +0000 (-0500)
Subject: lib: Send interface request after initial hello
X-Git-Tag: 7.1_pulled~277^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=22761baa25a8a519da0ad814a46fff6825eb87fb;p=matthieu%2Ffrr.git

lib: Send interface request after initial hello

Ask for all interface information after we have connected
to zebra and sent the initial hello.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/zclient.c b/lib/zclient.c
index a01da77669..9db1dd74f2 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -414,9 +414,6 @@ void zclient_send_reg_requests(struct zclient *zclient, vrf_id_t vrf_id)
 	/* We need router-id information. */
 	zebra_message_send(zclient, ZEBRA_ROUTER_ID_ADD, vrf_id);
 
-	/* We need interface information. */
-	zebra_message_send(zclient, ZEBRA_INTERFACE_ADD, vrf_id);
-
 	/* Set unwanted redistribute route. */
 	for (afi = AFI_IP; afi < AFI_MAX; afi++)
 		vrf_bitmap_set(zclient->redist[afi][zclient->redist_default],
@@ -481,9 +478,6 @@ void zclient_send_dereg_requests(struct zclient *zclient, vrf_id_t vrf_id)
 	/* We need router-id information. */
 	zebra_message_send(zclient, ZEBRA_ROUTER_ID_DELETE, vrf_id);
 
-	/* We need interface information. */
-	zebra_message_send(zclient, ZEBRA_INTERFACE_DELETE, vrf_id);
-
 	/* Set unwanted redistribute route. */
 	for (afi = AFI_IP; afi < AFI_MAX; afi++)
 		vrf_bitmap_unset(zclient->redist[afi][zclient->redist_default],
@@ -596,6 +590,8 @@ int zclient_start(struct zclient *zclient)
 
 	zebra_hello_send(zclient);
 
+	zebra_message_send(zclient, ZEBRA_INTERFACE_ADD, VRF_DEFAULT);
+
 	/* Inform the successful connection. */
 	if (zclient->zebra_connected)
 		(*zclient->zebra_connected)(zclient);