summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-11-16 23:17:52 +0100
committerDaniel Mack <daniel@zonque.org>2015-11-16 23:17:52 +0100
commit933f9caeeb2b3c1b951d330e04beb04226e5a890 (patch)
treedc36a6ddd84b060590c4885db7b6c3e9e91081eb /src/nspawn
parent5cd6491b71008334daa9965464e038dc3e39948a (diff)
siphash24: let siphash24_finalize() and siphash24() return the result directly
Rather than passing a pointer to return the result, return it directly from the function calls. Also, return the result in native endianess, and let the callers care about the conversion. For hash tables and bloom filters, we don't care, but in order to keep MAC addresses and DHCP client IDs stable, we explicitly convert to LE.
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn-network.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 92dfb945e0..9553192051 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -74,7 +74,7 @@ static int generate_mac(
/* Let's hash the host machine ID plus the container name. We
* use a fixed, but originally randomly created hash key here. */
- siphash24(&result, v, sz, hash_key.bytes);
+ result = htole64(siphash24(v, sz, hash_key.bytes));
assert_cc(ETH_ALEN <= sizeof(result));
memcpy(mac->ether_addr_octet, &result, ETH_ALEN);