summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Worley <sworley@cumulusnetworks.com>2019-12-12 20:14:51 -0500
committerStephen Worley <sworley@cumulusnetworks.com>2020-01-08 12:22:30 -0500
commit7713e71a10e84cdf7e28f4fb44cc1f02678fc14f (patch)
tree347086a9872d4aecf06bf15524542f6debba3985
parent9ab0b2a37afc6b098e9ae444459dbb783ad0a5ff (diff)
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>
-rw-r--r--pimd/pim_zlookup.c8
1 files changed, 8 insertions, 0 deletions
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);