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 77526281d18c1c8a2a479c4fc766bb03d864faa2..13b6fdf22f172aae165eabd68cdcad826a77dec9 100644 (file)
--- 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);