From 54ac0beceedb9b36eb58dd8599ba903c668382f6 Mon Sep 17 00:00:00 2001
From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Thu, 12 May 2016 16:16:25 +0200
Subject: Hash: fixed rta hashing wrt. structure padding

---
 nest/rt-attr.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'nest/rt-attr.c')

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 7d9605c2..62340530 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -946,8 +946,23 @@ rta_alloc_hash(void)
 static inline uint
 rta_hash(rta *a)
 {
-  return mem_hash(((void *)a) + offsetof(rta, src), sizeof(rta) - offsetof(rta, src)) ^
-	 mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs);
+  mem_hash_t h;
+  mem_hash_init(&h);
+#define MIX(f) mem_hash_mix(&h, &(rta->f), sizeof(rta->f));
+  MIX(src);
+  MIX(hostentry);
+  MIX(iface);
+  MIX(gw);
+  MIX(from);
+  MIX(igp_metric);
+  MIX(source);
+  MIX(scope);
+  MIX(cast);
+  MIX(dest);
+  MIX(flags);
+  MIX(aflags);
+
+  return mem_hash_value(&h) ^ mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs);
 }
 
 static inline int
-- 
cgit v1.2.3