zebra: Fix snmp walk of zebra rib

The snmp walk of the zebra rib was skipping entries
because in_addr_cmp was replaced with a prefix_cmp
which worked slightly differently causing parts
of the zebra rib tree to be skipped.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit ecd9d441b082e3f24139eb96915b18fc17996c08)

diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index 6fe24dfa5492b0532a32101a40a46829104e3a76..1b5c2e305a84a91a717c393268ea9e35a14d6c1d 100644 (file)
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -266,9 +266,11 @@ static void check_replace(struct route_node *np2, struct route_entry *re2,
                return;
        }
 
-       if (prefix_cmp(&(*np)->p, &np2->p) < 0)
+       if (in_addr_cmp((uint8_t *)&(*np)->p.u.prefix4,
+                       (uint8_t *)&np2->p.u.prefix4) < 0)
                return;
-       if (prefix_cmp(&(*np)->p, &np2->p) > 0) {
+       if (in_addr_cmp((uint8_t *)&(*np)->p.u.prefix4,
+                       (uint8_t *)&np2->p.u.prefix4) > 0) {
                *np = np2;
                *re = re2;
                return;