X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-address.c;h=c92418967b48ec5185d878b4631e9fb65083f6da;hb=e0333c7314e89c0bc268bd20c5e247a7c907ab34;hp=8a716300513c8ea2ea1bb575b8d290e026dcf6be;hpb=f048a16b464295a4e0a4f4c1210f06343ad31231;p=elogind.git diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 8a7163005..c92418967 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -46,6 +46,9 @@ int address_new_static(Network *network, unsigned section, Address **ret) { if (!address) return -ENOMEM; + address->family = AF_UNSPEC; + address->scope = RT_SCOPE_UNIVERSE; + address->network = network; LIST_PREPEND(static_addresses, network->static_addresses, address); @@ -68,6 +71,9 @@ int address_new_dynamic(Address **ret) { if (!address) return -ENOMEM; + address->family = AF_UNSPEC; + address->scope = RT_SCOPE_UNIVERSE; + *ret = address; address = NULL; @@ -91,7 +97,7 @@ void address_free(Address *address) { int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callback) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(address); @@ -101,14 +107,20 @@ int address_drop(Address *address, Link *link, assert(link->manager); assert(link->manager->rtnl); - r = sd_rtnl_message_addr_new(RTM_DELADDR, link->ifindex, - address->family, address->prefixlen, 0, 0, &req); + 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; } + 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 (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_LOCAL, &address->in_addr.in); else if (address->family == AF_INET6) @@ -130,7 +142,7 @@ int address_drop(Address *address, Link *link, int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(address); @@ -140,15 +152,32 @@ int address_configure(Address *address, Link *link, assert(link->manager); assert(link->manager->rtnl); - r = sd_rtnl_message_addr_new(RTM_NEWADDR, link->ifindex, - address->family, address->prefixlen, - IFA_F_PERMANENT, RT_SCOPE_UNIVERSE, &req); + 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; } + r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen); + if (r < 0) { + log_error("Could not set prefixlen: %s", strerror(-r)); + return r; + } + + 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; + } + + 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 (address->family == AF_INET) r = sd_rtnl_message_append_in_addr(req, IFA_LOCAL, &address->in_addr.in); else if (address->family == AF_INET6) @@ -160,11 +189,7 @@ int address_configure(Address *address, Link *link, } if (address->family == AF_INET) { - struct in_addr broadcast; - - broadcast.s_addr = address->in_addr.in.s_addr | address->netmask.s_addr; - - r = sd_rtnl_message_append_in_addr(req, IFA_BROADCAST, &broadcast); + 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)); @@ -190,6 +215,87 @@ int address_configure(Address *address, Link *link, return 0; } +int config_parse_dns(const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Address **dns = data; + _cleanup_address_free_ Address *n = NULL; + int r; + + assert(filename); + assert(section); + assert(lvalue); + assert(rvalue); + assert(data); + + r = address_new_dynamic(&n); + if (r < 0) + return r; + + r = net_parse_inaddr(rvalue, &n->family, &n->in_addr); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "DNS address is invalid, ignoring assignment: %s", rvalue); + return 0; + } + + *dns = n; + n = NULL; + + return 0; +} + +int config_parse_broadcast(const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; + _cleanup_address_free_ Address *n = NULL; + _cleanup_free_ char *address = NULL; + int r; + + assert(filename); + assert(section); + assert(lvalue); + assert(rvalue); + assert(data); + + r = address_new_static(network, section_line, &n); + if (r < 0) + return r; + + if (n->family == AF_INET6) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Broadcast is not valid for IPv6 addresses, " + "ignoring assignment: %s", address); + return 0; + } + + r = net_parse_inaddr(address, &n->family, &n->broadcast); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Broadcast is invalid, ignoring assignment: %s", address); + return 0; + } + + n = NULL; + + return 0; +} + int config_parse_address(const char *unit, const char *filename, unsigned line, @@ -237,7 +343,6 @@ int config_parse_address(const char *unit, } n->prefixlen = (unsigned char) i; - n->netmask.s_addr = htonl(0xfffffffflu >> n->prefixlen); address = strndup(rvalue, e - rvalue); if (!address) @@ -255,6 +360,10 @@ int config_parse_address(const char *unit, return 0; } + if (n->family == AF_INET && !n->broadcast.s_addr) + n->broadcast.s_addr = n->in_addr.in.s_addr | + htonl(0xfffffffflu >> n->prefixlen); + n = NULL; return 0;