From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 31 Dec 2019 23:41:16 +0000 (-0500)
Subject: ripngd: Fix redistribute/no redistribute rinse repeat commands
X-Git-Tag: base_7.3~46^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2afebed21fb2bc559b345e47ab496435849b9f3d;p=matthieu%2Ffrr.git

ripngd: Fix redistribute/no redistribute rinse repeat commands

ripngd was using zclient_redistribute for installation but not
for removal.  As such the lib/zclient.c was not properly tracking
add/removal.  I think it would be best to just let ripng to track
this instead of zclient.

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

diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index fa61d69caa..f9bd56d1df 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -152,8 +152,8 @@ static int ripng_zebra_read_route(ZAPI_CALLBACK_ARGS)
 
 void ripng_redistribute_conf_update(struct ripng *ripng, int type)
 {
-	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0,
-			     ripng->vrf->vrf_id);
+	zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6,
+				type, 0, ripng->vrf->vrf_id);
 }
 
 void ripng_redistribute_conf_delete(struct ripng *ripng, int type)