From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Fri, 13 Dec 2019 01:14:51 +0000 (-0500)
Subject: pimd: allow pimd to handle nexthop_lookup zapi error
X-Git-Tag: base_7.3~5^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7713e71a10e84cdf7e28f4fb44cc1f02678fc14f;p=mirror%2Ffrr.git

pimd: allow pimd to handle nexthop_lookup zapi error

Allow pimd to stop the lookup if zebra tells pimd that the
lookup failed due to a zapi error. Otherwise, it will keep
waiting for a nexthop message that will never come.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
---

diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 77526281d1..13b6fdf22f 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -180,6 +180,14 @@ static int zclient_read_nexthop(struct pim_instance *pim,
 			zclient_lookup_failed(zlookup);
 			return -1;
 		}
+
+		if (command == ZEBRA_ERROR) {
+			enum zebra_error_types error;
+
+			zapi_error_decode(s, &error);
+			/* Do nothing with it for now */
+			return -1;
+		}
 	}
 
 	raddr.s_addr = stream_get_ipv4(s);