From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 22 Mar 2011 16:14:57 +0000 (+0000)
Subject: bgpd: attribute jhash call should use a standard interface to in6_addr data
X-Git-Tag: frr-2.0-rc1~2084
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=98e30f5db6dea65a5d6a176065cd0b60eb7bb001;p=mirror%2Ffrr.git

bgpd: attribute jhash call should use a standard interface to in6_addr data

* bgp_attr.c; (attrhash_key_make) s6_addr is only member of in6_addr
  guaranteed to be available - s6_addr32 isn't. Fix to be more portable, and
  thus allow compilation on BSD again.
---

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index e2b6054b06..7e302652ce 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -373,8 +373,8 @@ attrhash_key_make (void *p)
 
 #ifdef HAVE_IPV6
       MIX(attr->extra->mp_nexthop_len);
-      key = jhash2(attr->extra->mp_nexthop_global.s6_addr32, 4, key);
-      key = jhash2(attr->extra->mp_nexthop_local.s6_addr32, 4, key);
+      key = jhash2(attr->extra->mp_nexthop_global.s6_addr, 16, key);
+      key = jhash2(attr->extra->mp_nexthop_local.s6_addr, 16, key);
 #endif /* HAVE_IPV6 */
     }