From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 15 Jun 2017 17:53:04 +0000 (-0400)
Subject: pimd: When we get nexthops back we may not have configured pim on all intfs
X-Git-Tag: frr-4.0-dev~468^2~45
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=01460fbca307aabcf407e759d95ace5e1d579f8f;p=mirror%2Ffrr.git

pimd: When we get nexthops back we may not have configured pim on all intfs

Be aware that we may not have pim configured on all interfaces when
we have a failure situation.

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

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index eb487b9626..150820fb85 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -778,8 +778,10 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
 							"%s: NHT pim nbr not found on interface %s nbr count:%d ",
 							__PRETTY_FUNCTION__,
 							ifp1->name,
-							pim_ifp->pim_neighbor_list
-								->count);
+							pim_ifp
+								? pim_ifp->pim_neighbor_list
+									  ->count
+								: 0);
 					}
 					// Mark nexthop address to 0 until PIM
 					// Nbr is resolved.