commit 782c882077b5a63213b3d160535d5e8259f6df61
author Donald Sharp <sharpd@cumulusnetworks.com> Mon Sep 14 13:29:37 2015 -0400
committer Paul Jakma <paul@quagga.net> Thu Sep 24 15:26:45 2015 +0100
tree 31a9ed3f8d228f41080e684557b48939943ee6a8
parent 8ccd74c29f5242f312c1e0561497558482c9be65

zebra: rib->nexthop_num is double incremented

While reading linux kernel netlink messages, rib->nexthop_num is incremented
in the read loop as well as the underlying nexthop_add() function call.  This
number should only be incremented in one spot.  Removing the increment from
the read loop and allowing the underlying code to track this data as it is
already.

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

zebra/rt_netlink.c

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 33fbc08..cbcbe7c 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -765,7 +765,6 @@
               if (len < (int) sizeof (*rtnh) || rtnh->rtnh_len > len)
                 break;
 
-              rib->nexthop_num++;
               index = rtnh->rtnh_ifindex;
               gate = 0;
               if (rtnh->rtnh_len > sizeof (*rtnh))
@@ -968,7 +967,6 @@
                   if (len < (int) sizeof (*rtnh) || rtnh->rtnh_len > len)
                     break;
 
-                  rib->nexthop_num++;
                   index = rtnh->rtnh_ifindex;
                   gate = 0;
                   if (rtnh->rtnh_len > sizeof (*rtnh))