Merge pull request #30633 from mrc0mmand/cocci-shenanigans

[thirdparty/systemd.git] / src / network / networkd-route.c

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 30295e6bb6e08f3b89f43892692e6c920c8ab3ec..0743a3427e7f08005569af57eaa06702873d8e3a 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -115,37 +115,37 @@ Route *route_free(Route *route) {
 static void route_hash_func(const Route *route, struct siphash *state) {
         assert(route);
 
-        siphash24_compress(&route->family, sizeof(route->family), state);
+        siphash24_compress_typesafe(route->family, state);
 
         switch (route->family) {
         case AF_INET:
         case AF_INET6:
-                siphash24_compress(&route->dst_prefixlen, sizeof(route->dst_prefixlen), state);
-                siphash24_compress(&route->dst, FAMILY_ADDRESS_SIZE(route->family), state);
+                siphash24_compress_typesafe(route->dst_prefixlen, state);
+                in_addr_hash_func(&route->dst, route->family, state);
 
-                siphash24_compress(&route->src_prefixlen, sizeof(route->src_prefixlen), state);
-                siphash24_compress(&route->src, FAMILY_ADDRESS_SIZE(route->family), state);
+                siphash24_compress_typesafe(route->src_prefixlen, state);
+                in_addr_hash_func(&route->src, route->family, state);
 
-                siphash24_compress(&route->gw_family, sizeof(route->gw_family), state);
+                siphash24_compress_typesafe(route->gw_family, state);
                 if (IN_SET(route->gw_family, AF_INET, AF_INET6)) {
-                        siphash24_compress(&route->gw, FAMILY_ADDRESS_SIZE(route->gw_family), state);
-                        siphash24_compress(&route->gw_weight, sizeof(route->gw_weight), state);
+                        in_addr_hash_func(&route->gw, route->gw_family, state);
+                        siphash24_compress_typesafe(route->gw_weight, state);
                 }
 
-                siphash24_compress(&route->prefsrc, FAMILY_ADDRESS_SIZE(route->family), state);
+                in_addr_hash_func(&route->prefsrc, route->family, state);
 
-                siphash24_compress(&route->tos, sizeof(route->tos), state);
-                siphash24_compress(&route->priority, sizeof(route->priority), state);
-                siphash24_compress(&route->table, sizeof(route->table), state);
-                siphash24_compress(&route->protocol, sizeof(route->protocol), state);
-                siphash24_compress(&route->scope, sizeof(route->scope), state);
-                siphash24_compress(&route->type, sizeof(route->type), state);
+                siphash24_compress_typesafe(route->tos, state);
+                siphash24_compress_typesafe(route->priority, state);
+                siphash24_compress_typesafe(route->table, state);
+                siphash24_compress_typesafe(route->protocol, state);
+                siphash24_compress_typesafe(route->scope, state);
+                siphash24_compress_typesafe(route->type, state);
 
-                siphash24_compress(&route->initcwnd, sizeof(route->initcwnd), state);
-                siphash24_compress(&route->initrwnd, sizeof(route->initrwnd), state);
+                siphash24_compress_typesafe(route->initcwnd, state);
+                siphash24_compress_typesafe(route->initrwnd, state);
 
-                siphash24_compress(&route->advmss, sizeof(route->advmss), state);
-                siphash24_compress(&route->nexthop_id, sizeof(route->nexthop_id), state);
+                siphash24_compress_typesafe(route->advmss, state);
+                siphash24_compress_typesafe(route->nexthop_id, state);
 
                 break;
         default: