pimd: pimd crashes during neighbor clean up

RCA:
It has asserted because during neighbor delete on a interface,
pim_number_of_nonlandelay_neighbors count has become less less than 0.
This was due to not updating the count when hello option changed.

Fix:
During hello option update, check and increment or decrement when this option changes.

Signed-off-by: Saravanan K <saravanank@vmware.com>

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index ca7ca114022b1d2c1252f56196126c8e5b862f5c..d8a797f9801211a8b197a80c92962ad5e0c8ef98 100644 (file)
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -779,6 +779,7 @@ void pim_neighbor_update(struct pim_neighbor *neigh,
                         uint32_t dr_priority, struct list *addr_list)
 {
        struct pim_interface *pim_ifp = neigh->interface->info;
+       uint32_t old, new;
 
        /* Received holdtime ? */
        if (PIM_OPTION_IS_SET(hello_options, PIM_OPTION_MASK_HOLDTIME)) {
@@ -818,6 +819,16 @@ void pim_neighbor_update(struct pim_neighbor *neigh,
        neigh->prefix_list = addr_list;
 
        update_dr_priority(neigh, hello_options, dr_priority);
+       new = PIM_OPTION_IS_SET(hello_options, PIM_OPTION_MASK_LAN_PRUNE_DELAY);
+       old = PIM_OPTION_IS_SET(neigh->hello_options,
+                               PIM_OPTION_MASK_LAN_PRUNE_DELAY);
+
+       if (old != new) {
+               if (old)
+                       ++pim_ifp->pim_number_of_nonlandelay_neighbors;
+               else
+                       --pim_ifp->pim_number_of_nonlandelay_neighbors;
+       }
        /*
          Copy flags
         */