const char *rvalue,
void *data,
void *userdata) {
- Set **dns = data;
+ Network *network = userdata;
+ Address *tail;
_cleanup_address_free_ Address *n = NULL;
int r;
assert(section);
assert(lvalue);
assert(rvalue);
- assert(data);
+ assert(network);
r = address_new_dynamic(&n);
if (r < 0)
return 0;
}
- set_put(*dns, n);
+ if (streq(lvalue, "DNS")) {
+ LIST_FIND_TAIL(addresses, network->dns, tail);
+ LIST_INSERT_AFTER(addresses, network->dns, tail, n);
+ } else if (streq(lvalue, "NTP")) {
+ LIST_FIND_TAIL(addresses, network->ntp, tail);
+ LIST_INSERT_AFTER(addresses, network->ntp, tail, n);
+ } else {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Key is invalid, ignoring assignment: %s=%s", lvalue, rvalue);
+ return 0;
+ }
+
n = NULL;
return 0;
return 0;
}
+
+bool address_equal(Address *a1, Address *a2) {
+ /* same object */
+ if (a1 == a2)
+ return true;
+
+ /* one, but not both, is NULL */
+ if (!a1 || !a2)
+ return false;
+
+ if (a1->family != a2->family)
+ return false;
+
+ switch (a1->family) {
+ /* use the same notion of equality as the kernel does */
+ case AF_UNSPEC:
+ return true;
+
+ case AF_INET:
+ if (a1->prefixlen != a2->prefixlen)
+ return false;
+ else {
+ uint32_t b1, b2;
+
+ b1 = be32toh(a1->in_addr.in.s_addr);
+ b2 = be32toh(a2->in_addr.in.s_addr);
+
+ return (b1 >> (32 - a1->prefixlen)) == (b2 >> (32 - a1->prefixlen));
+ }
+
+ case AF_INET6:
+ {
+ uint64_t *b1, *b2;
+
+ b1 = (uint64_t*)&a1->in_addr.in6;
+ b2 = (uint64_t*)&a2->in_addr.in6;
+
+ return (((b1[0] ^ b2[0]) | (b1[1] ^ b2[1])) == 0UL);
+ }
+ default:
+ assert_not_reached("Invalid address family");
+ }
+}