From: Ken Williams <kenneth.j.williams@intel.com>
Date: Tue, 15 Apr 2014 02:23:11 +0000 (+0000)
Subject: zebra: Change the mechanism for comparing route ID's.
X-Git-Tag: frr-2.0-rc1~1608
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=24c84dbe806084552d7bb14b9f1d00514a048b9d;p=mirror%2Ffrr.git

zebra: Change the mechanism for comparing route ID's.

The current format uses subtraction of two ints. Unfortunately, the
subtraction method does not work for all combinations of numbers.
For example, the with numbers represented by 10.x.x.x and 192.x.x.x,
10.x.x.x - 192.x.x.x will yield a very large positive number indicating
that 10.x.x.x is larger.

Signed-off-by: Ken Williams <kenneth.j.williams@intel.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/zebra/router-id.c b/zebra/router-id.c
index 3d6b511c53..b738027ec4 100644
--- a/zebra/router-id.c
+++ b/zebra/router-id.c
@@ -230,10 +230,8 @@ router_id_cmp (void *a, void *b)
 {
   const struct connected *ifa = (const struct connected *)a;
   const struct connected *ifb = (const struct connected *)b;
-  unsigned int A = ntohl(ifa->address->u.prefix4.s_addr);
-  unsigned int B = ntohl(ifb->address->u.prefix4.s_addr);
 
-  return (int) (A - B);
+  return IPV4_ADDR_CMP(&ifa->address->u.prefix4.s_addr,&ifb->address->u.prefix4.s_addr);
 }
 
 void