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=47033acde4e1fab18fcb32e764d13a53707fcf12;hp=ae87b8352425bf25d4cbcae9972344180f004ebb;hb=6cb8e687f038424ef54b5c5c3c433be974fbe371;hpb=44e7b9492617408130d11ffa451c2660942974f6 diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index ae87b8352..47033acde 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -21,12 +21,13 @@ #include -#include "networkd.h" - #include "utf8.h" #include "util.h" #include "conf-parser.h" +#include "fw-util.h" #include "network-internal.h" +#include "networkd.h" +#include "networkd-link.h" static void address_init(Address *address) { assert(address); @@ -58,7 +59,7 @@ int address_new_static(Network *network, unsigned section, Address **ret) { address->network = network; - LIST_PREPEND(addresses, network->static_addresses, address); + LIST_APPEND(addresses, network->static_addresses, address); if (section) { address->section = section; @@ -102,6 +103,54 @@ void address_free(Address *address) { free(address); } +int address_establish(Address *address, Link *link) { + bool masq; + int r; + + assert(address); + assert(link); + + masq = link->network && + link->network->ip_masquerade && + address->family == AF_INET && + address->scope < RT_SCOPE_LINK; + + /* Add firewall entry if this is requested */ + if (address->ip_masquerade_done != masq) { + union in_addr_union masked = address->in_addr; + in_addr_mask(address->family, &masked, address->prefixlen); + + r = fw_add_masquerade(masq, AF_INET, 0, &masked, address->prefixlen, NULL, NULL, 0); + if (r < 0) + log_link_warning_errno(link, r, "Could not enable IP masquerading: %m"); + + address->ip_masquerade_done = masq; + } + + return 0; +} + +int address_release(Address *address, Link *link) { + int r; + + assert(address); + assert(link); + + /* Remove masquerading firewall entry if it was added */ + if (address->ip_masquerade_done) { + union in_addr_union masked = address->in_addr; + in_addr_mask(address->family, &masked, address->prefixlen); + + r = fw_add_masquerade(false, AF_INET, 0, &masked, address->prefixlen, NULL, NULL, 0); + if (r < 0) + log_link_warning_errno(link, r, "Failed to disable IP masquerading: %m"); + + address->ip_masquerade_done = false; + } + + return 0; +} + int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callback) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; @@ -114,35 +163,27 @@ int address_drop(Address *address, Link *link, assert(link->manager); assert(link->manager->rtnl); + address_release(address, link); + r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_DELADDR, link->ifindex, address->family); - if (r < 0) { - log_error("Could not allocate RTM_DELADDR message: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not allocate RTM_DELADDR message: %m"); r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen); - if (r < 0) { - log_error("Could not set prefixlen: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set prefixlen: %m"); if (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_LOCAL, &address->in_addr.in); else if (address->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, IFA_LOCAL, &address->in_addr.in6); - if (r < 0) { - log_error("Could not append IFA_LOCAL attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_LOCAL attribute: %m"); 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)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not send rtnetlink message: %m"); link_ref(link); @@ -162,70 +203,47 @@ int address_update(Address *address, Link *link, r = sd_rtnl_message_new_addr_update(link->manager->rtnl, &req, link->ifindex, address->family); - if (r < 0) { - log_error("Could not allocate RTM_NEWADDR message: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not allocate RTM_NEWADDR message: %m"); r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen); - if (r < 0) { - log_error("Could not set prefixlen: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set prefixlen: %m"); r = sd_rtnl_message_addr_set_flags(req, IFA_F_PERMANENT); - if (r < 0) { - log_error("Could not set flags: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set flags: %m"); r = sd_rtnl_message_addr_set_scope(req, address->scope); - if (r < 0) { - log_error("Could not set scope: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set scope: %m"); if (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_LOCAL, &address->in_addr.in); else if (address->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, IFA_LOCAL, &address->in_addr.in6); - if (r < 0) { - log_error("Could not append IFA_LOCAL attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_LOCAL attribute: %m"); if (address->family == AF_INET) { r = sd_rtnl_message_append_in_addr(req, IFA_BROADCAST, &address->broadcast); - if (r < 0) { - log_error("Could not append IFA_BROADCAST attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_BROADCAST attribute: %m"); } if (address->label) { r = sd_rtnl_message_append_string(req, IFA_LABEL, address->label); - if (r < 0) { - log_error("Could not append IFA_LABEL attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_LABEL attribute: %m"); } 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; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_CACHEINFO attribute: %m"); 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)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not send rtnetlink message: %m"); link_ref(link); @@ -250,16 +268,16 @@ static int address_acquire(Link *link, Address *original, Address **ret) { * 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)); + log_link_error(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."); + log_link_error(link, "Couldn't find free address for interface, all taken."); return -EBUSY; } if (original->family == AF_INET) { - /* Pick first address in range for ourselves ...*/ + /* 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 */ @@ -311,86 +329,62 @@ int address_configure(Address *address, Link *link, r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_NEWADDR, link->ifindex, address->family); - if (r < 0) { - log_error("Could not allocate RTM_NEWADDR message: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not allocate RTM_NEWADDR message: %m"); r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen); - if (r < 0) { - log_error("Could not set prefixlen: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set prefixlen: %m"); r = sd_rtnl_message_addr_set_flags(req, IFA_F_PERMANENT); - if (r < 0) { - log_error("Could not set flags: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set flags: %m"); r = sd_rtnl_message_addr_set_scope(req, address->scope); - if (r < 0) { - log_error("Could not set scope: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not set scope: %m"); if (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_LOCAL, &address->in_addr.in); else if (address->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, IFA_LOCAL, &address->in_addr.in6); - if (r < 0) { - log_error("Could not append IFA_LOCAL attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_LOCAL attribute: %m"); if (!in_addr_is_null(address->family, &address->in_addr_peer)) { if (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_ADDRESS, &address->in_addr_peer.in); else if (address->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, IFA_ADDRESS, &address->in_addr_peer.in6); - if (r < 0) { - log_error("Could not append IFA_ADDRESS attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_ADDRESS attribute: %m"); } else { if (address->family == AF_INET) { r = sd_rtnl_message_append_in_addr(req, IFA_BROADCAST, &address->broadcast); - if (r < 0) { - log_error("Could not append IFA_BROADCAST attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_BROADCAST attribute: %m"); } } if (address->label) { r = sd_rtnl_message_append_string(req, IFA_LABEL, address->label); - if (r < 0) { - log_error("Could not append IFA_LABEL attribute: %s", - strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_LABEL attribute: %m"); } 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; - } + if (r < 0) + return log_error_errno(r, "Could not append IFA_CACHEINFO attribute: %m"); 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)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not send rtnetlink message: %m"); link_ref(link); + address_establish(address, link); + return 0; } @@ -481,7 +475,7 @@ int config_parse_address(const char *unit, r = safe_atou(e + 1, &i); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Interface prefix length is invalid, ignoring assignment: %s", e + 1); + "Prefix length is invalid, ignoring assignment: %s", e + 1); return 0; } @@ -498,6 +492,15 @@ int config_parse_address(const char *unit, return 0; } + if (!e && f == AF_INET) { + r = in_addr_default_prefixlen(&buffer.in, &n->prefixlen); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Prefix length not specified, and a default one can not be deduced for '%s', ignoring assignment", address); + return 0; + } + } + if (n->family != AF_UNSPEC && f != n->family) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Address is incompatible, ignoring assignment: %s", address); @@ -589,6 +592,10 @@ bool address_equal(Address *a1, Address *a2) { case AF_INET: if (a1->prefixlen != a2->prefixlen) return false; + else if (a1->prefixlen == 0) + /* make sure we don't try to shift by 32. + * See ISO/IEC 9899:TC3 § 6.5.7.3. */ + return true; else { uint32_t b1, b2; @@ -598,8 +605,7 @@ bool address_equal(Address *a1, Address *a2) { return (b1 >> (32 - a1->prefixlen)) == (b2 >> (32 - a1->prefixlen)); } - case AF_INET6: - { + case AF_INET6: { uint64_t *b1, *b2; b1 = (uint64_t*)&a1->in_addr.in6; @@ -607,6 +613,7 @@ bool address_equal(Address *a1, Address *a2) { return (((b1[0] ^ b2[0]) | (b1[1] ^ b2[1])) == 0UL); } + default: assert_not_reached("Invalid address family"); }