X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-address.c;h=76febc7a07853f9fa173c781858b9d72a65ddbfb;hp=87688a5ae60db115dbc465963a3f50f986ed33aa;hb=0372cb2bd2342fa5c5585c666f79159a8341f4a6;hpb=aba496a58acf9d9c61314de71353550e579f85ee diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 87688a5ae..76febc7a0 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -59,7 +59,7 @@ int address_new_static(Network *network, unsigned section, Address **ret) { address->network = network; - LIST_PREPEND(static_addresses, network->static_addresses, address); + LIST_PREPEND(addresses, network->static_addresses, address); if (section) { address->section = section; @@ -92,7 +92,7 @@ void address_free(Address *address) { return; if (address->network) { - LIST_REMOVE(static_addresses, address->network->static_addresses, address); + LIST_REMOVE(addresses, address->network->static_addresses, address); if (address->section) hashmap_remove(address->network->addresses_by_section, @@ -228,6 +228,67 @@ int address_update(Address *address, Link *link, return 0; } +static int address_acquire(Link *link, Address *original, Address **ret) { + union in_addr_union in_addr = {}; + struct in_addr broadcast = {}; + _cleanup_address_free_ Address *na = NULL; + int r; + + assert(link); + assert(original); + assert(ret); + + /* Something useful was configured? just use it */ + if (in_addr_null(original->family, &original->in_addr) <= 0) + return 0; + + /* The address is configured to be 0.0.0.0 or [::] by the user? + * Then let's acquire something more useful from the pool. */ + r = manager_address_pool_acquire(link->manager, original->family, original->prefixlen, &in_addr); + if (r < 0) { + log_error_link(link, "Failed to acquire address from pool: %s", strerror(-r)); + return r; + } + if (r == 0) { + log_error_link(link, "Couldn't find free address for interface, all taken."); + return -EBUSY; + } + + if (original->family == AF_INET) { + /* Pick first address in range for ourselves ...*/ + in_addr.in.s_addr = in_addr.in.s_addr | htobe32(1); + + /* .. and use last as broadcast address */ + broadcast.s_addr = in_addr.in.s_addr | htobe32(0xFFFFFFFFUL >> original->prefixlen); + } else if (original->family == AF_INET6) + in_addr.in6.s6_addr[15] |= 1; + + r = address_new_dynamic(&na); + if (r < 0) + return r; + + na->family = original->family; + na->prefixlen = original->prefixlen; + na->scope = original->scope; + na->cinfo = original->cinfo; + + if (original->label) { + na->label = strdup(original->label); + if (!na->label) + return -ENOMEM; + } + + na->broadcast = broadcast; + na->in_addr = in_addr; + + LIST_PREPEND(addresses, link->pool_addresses, na); + + *ret = na; + na = NULL; + + return 0; +} + int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; @@ -240,6 +301,10 @@ int address_configure(Address *address, Link *link, assert(link->manager); assert(link->manager->rtnl); + r = address_acquire(link, address, &address); + if (r < 0) + return r; + r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_NEWADDR, link->ifindex, address->family); if (r < 0) { @@ -294,6 +359,14 @@ int address_configure(Address *address, Link *link, } } + r = sd_rtnl_message_append_cache_info(req, IFA_CACHEINFO, + &address->cinfo); + if (r < 0) { + log_error("Could not append IFA_CACHEINFO attribute: %s", + strerror(-r)); + return r; + } + r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL); if (r < 0) { log_error("Could not send rtnetlink message: %s", strerror(-r)); @@ -313,7 +386,8 @@ int config_parse_dns(const char *unit, const char *rvalue, void *data, void *userdata) { - Set **dns = data; + Network *network = userdata; + Address *tail; _cleanup_address_free_ Address *n = NULL; int r; @@ -321,7 +395,7 @@ int config_parse_dns(const char *unit, assert(section); assert(lvalue); assert(rvalue); - assert(data); + assert(network); r = address_new_dynamic(&n); if (r < 0) @@ -334,7 +408,18 @@ int config_parse_dns(const char *unit, 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; @@ -506,3 +591,46 @@ int config_parse_label(const char *unit, 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"); + } +}