summaryrefslogtreecommitdiff
path: root/src/basic/ether-addr-util.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-05-07 01:30:00 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-05-09 11:57:36 +0900
commit583706abf96d2ea8cb2cd17e118d9254b47bd67f (patch)
tree20899a40bacb86eca4f3460f2beb25df687aef41 /src/basic/ether-addr-util.c
parente5c1be89b5fbf5bcdb645314265675fd47d64774 (diff)
downloadsystemd-583706abf96d2ea8cb2cd17e118d9254b47bd67f.tar.gz
ether-addr-util: add hash_ops functions for struct ether_addr
Diffstat (limited to 'src/basic/ether-addr-util.c')
-rw-r--r--src/basic/ether-addr-util.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/basic/ether-addr-util.c b/src/basic/ether-addr-util.c
index 7e08ba09f0..99ef936e84 100644
--- a/src/basic/ether-addr-util.c
+++ b/src/basic/ether-addr-util.c
@@ -33,18 +33,22 @@ char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR
return buffer;
}
-bool ether_addr_equal(const struct ether_addr *a, const struct ether_addr *b) {
+int ether_addr_compare(const void *a, const void *b) {
assert(a);
assert(b);
- return a->ether_addr_octet[0] == b->ether_addr_octet[0] &&
- a->ether_addr_octet[1] == b->ether_addr_octet[1] &&
- a->ether_addr_octet[2] == b->ether_addr_octet[2] &&
- a->ether_addr_octet[3] == b->ether_addr_octet[3] &&
- a->ether_addr_octet[4] == b->ether_addr_octet[4] &&
- a->ether_addr_octet[5] == b->ether_addr_octet[5];
+ return memcmp(a, b, ETH_ALEN);
}
+static void ether_addr_hash_func(const void *p, struct siphash *state) {
+ siphash24_compress(p, sizeof(struct ether_addr), state);
+}
+
+const struct hash_ops ether_addr_hash_ops = {
+ .hash = ether_addr_hash_func,
+ .compare = ether_addr_compare
+};
+
int ether_addr_from_string(const char *s, struct ether_addr *ret) {
size_t pos = 0, n, field;
char sep = '\0';