From: Donald Sharp <sharpd@nvidia.com>
Date: Wed, 25 Sep 2024 16:06:29 +0000 (-0400)
Subject: zebra: Fix snmp walk of zebra rib
X-Git-Tag: docker/10.0.3~47^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7cd5834d1619f91fcde2a05d5157200f120dba64;p=mirror%2Ffrr.git

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 1c6d58159e..5a99ac0500 100644
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -253,9 +253,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;