From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 17 Sep 2019 17:13:09 +0000 (+0200)
Subject: networkd: make neighbor_hash_func() handle the same data as neighbor_compare_func()
X-Git-Tag: v244~318^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a811fb8b377268566704514e2b05d1b9cb98e5ac;p=platform%2Fupstream%2Fsystemd.git

networkd: make neighbor_hash_func() handle the same data as neighbor_compare_func()

In practice this probably makes little difference, because we only use AF_INET
and AF_INET6, but it's cleaner to use the same logic in both places.
---

diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
index 537f6be..fd61ebd 100644
--- a/src/network/networkd-neighbor.c
+++ b/src/network/networkd-neighbor.c
@@ -209,18 +209,20 @@ static void neighbor_hash_func(const Neighbor *neighbor, struct siphash *state)
         assert(neighbor);
 
         siphash24_compress(&neighbor->family, sizeof(neighbor->family), state);
+        siphash24_compress(&neighbor->lladdr_size, sizeof(neighbor->lladdr_size), state);
 
         switch (neighbor->family) {
         case AF_INET:
         case AF_INET6:
                 /* Equality of neighbors are given by the pair (addr,lladdr) */
                 siphash24_compress(&neighbor->in_addr, FAMILY_ADDRESS_SIZE(neighbor->family), state);
-                siphash24_compress(&neighbor->lladdr, neighbor->lladdr_size, state);
                 break;
         default:
                 /* treat any other address family as AF_UNSPEC */
                 break;
         }
+
+        siphash24_compress(&neighbor->lladdr, neighbor->lladdr_size, state);
 }
 
 static int neighbor_compare_func(const Neighbor *a, const Neighbor *b) {