X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=056e063f26a79a2e9b9e272dd8a6fbc868519eb1;hp=f42fc171bd0b133c58668c34a4d4f3990c510b1e;hb=bd8f65387673e29f46136a4ed172097035002c23;hpb=a613382bbf4357ce13f17c988713b80172e091fb diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index f42fc171b..056e063f2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -23,6 +23,7 @@ #include #include "networkd.h" +#include "networkd-netdev.h" #include "network-internal.h" #include "path-util.h" #include "conf-files.h" @@ -47,8 +48,8 @@ static int network_load_one(Manager *manager, const char *filename) { return -errno; } - if (null_or_empty_path(filename)) { - log_debug("skipping empty file: %s", filename); + if (null_or_empty_fd(fileno(file))) { + log_debug("Skipping empty file: %s", filename); return 0; } @@ -61,19 +62,15 @@ static int network_load_one(Manager *manager, const char *filename) { LIST_HEAD_INIT(network->static_addresses); LIST_HEAD_INIT(network->static_routes); - network->vlans = hashmap_new(string_hash_func, string_compare_func); - if (!network->vlans) + network->stacked_netdevs = hashmap_new(string_hash_func, string_compare_func); + if (!network->stacked_netdevs) return log_oom(); - network->macvlans = hashmap_new(uint64_hash_func, uint64_compare_func); - if (!network->macvlans) - return log_oom(); - - network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func); + network->addresses_by_section = hashmap_new(NULL, NULL); if (!network->addresses_by_section) return log_oom(); - network->routes_by_section = hashmap_new(uint64_hash_func, uint64_compare_func); + network->routes_by_section = hashmap_new(NULL, NULL); if (!network->routes_by_section) return log_oom(); @@ -81,17 +78,24 @@ static int network_load_one(Manager *manager, const char *filename) { if (!network->filename) return log_oom(); + network->ipv4ll_route = true; + + network->dhcp = DHCP_SUPPORT_NONE; network->dhcp_ntp = true; network->dhcp_dns = true; network->dhcp_hostname = true; network->dhcp_domainname = true; + network->dhcp_routes = true; + network->dhcp_sendhost = true; - r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup, - (void*) network_network_gperf_lookup, false, false, network); - if (r < 0) { - log_warning("Could not parse config file %s: %s", filename, strerror(-r)); + network->llmnr = LLMNR_SUPPORT_YES; + + r = config_parse(NULL, filename, file, + "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", + config_item_perf_lookup, network_network_gperf_lookup, + false, false, true, network); + if (r < 0) return r; - } LIST_PREPEND(networks, manager->networks, network); @@ -160,28 +164,18 @@ void network_free(Network *network) { free(network->match_name); free(network->description); + free(network->dhcp_vendor_class_identifier); - while ((address = network->ntp)) { - LIST_REMOVE(addresses, network->ntp, address); - address_free(address); - } - - while ((address = network->dns)) { - LIST_REMOVE(addresses, network->dns, address); - address_free(address); - } + strv_free(network->ntp); + strv_free(network->dns); netdev_unref(network->bridge); netdev_unref(network->bond); - HASHMAP_FOREACH(netdev, network->vlans, i) + HASHMAP_FOREACH(netdev, network->stacked_netdevs, i) netdev_unref(netdev); - hashmap_free(network->vlans); - - HASHMAP_FOREACH(netdev, network->macvlans, i) - netdev_unref(netdev); - hashmap_free(network->macvlans); + hashmap_free(network->stacked_netdevs); while ((route = network->static_routes)) route_free(route); @@ -223,7 +217,7 @@ int network_get(Manager *manager, struct udev_device *device, udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), ifname)) { - log_debug("%*s: found matching network '%s'", IFNAMSIZ, ifname, + log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename); *ret = network; return 0; @@ -240,6 +234,26 @@ int network_apply(Manager *manager, Network *network, Link *link) { link->network = network; + if (network->ipv4ll_route) { + Route *route; + + r = route_new_static(network, 0, &route); + if (r < 0) + return r; + + r = inet_pton(AF_INET, "169.254.0.0", &route->dst_addr.in); + if (r == 0) + return -EINVAL; + if (r < 0) + return -errno; + + route->family = AF_INET; + route->dst_prefixlen = 16; + route->scope = RT_SCOPE_LINK; + route->metrics = IPV4LL_ROUTE_METRIC; + route->protocol = RTPROT_STATIC; + } + if (network->dns || network->ntp) { r = link_save(link); if (r < 0) @@ -309,19 +323,13 @@ int config_parse_netdev(const char *unit, break; case NETDEV_KIND_VLAN: - r = hashmap_put(network->vlans, &netdev->vlanid, netdev); - if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Can not add VLAN to network: %s", rvalue); - return 0; - } - - break; case NETDEV_KIND_MACVLAN: - r = hashmap_put(network->macvlans, netdev->ifname, netdev); + case NETDEV_KIND_VXLAN: + r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Can not add MACVLAN to network: %s", rvalue); + "Can not add VLAN '%s' to network: %s", + rvalue, strerror(-r)); return 0; } @@ -370,7 +378,118 @@ int config_parse_tunnel(const char *unit, return 0; } - network->tunnel = netdev; + r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Can not add VLAN '%s' to network: %s", + rvalue, strerror(-r)); + return 0; + } + + netdev_ref(netdev); + + return 0; +} + +static const char* const dhcp_support_table[_DHCP_SUPPORT_MAX] = { + [DHCP_SUPPORT_NONE] = "none", + [DHCP_SUPPORT_BOTH] = "both", + [DHCP_SUPPORT_V4] = "v4", + [DHCP_SUPPORT_V6] = "v6", +}; + +DEFINE_STRING_TABLE_LOOKUP(dhcp_support, DHCPSupport); + +int config_parse_dhcp( + 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) { + + DHCPSupport *dhcp = data; + int k; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + /* Our enum shall be a superset of booleans, hence first try + * to parse as boolean, and then as enum */ + + k = parse_boolean(rvalue); + if (k > 0) + *dhcp = DHCP_SUPPORT_BOTH; + else if (k == 0) + *dhcp = DHCP_SUPPORT_NONE; + else { + DHCPSupport s; + + s = dhcp_support_from_string(rvalue); + if (s < 0){ + log_syntax(unit, LOG_ERR, filename, line, -s, "Failed to parse DHCP option, ignoring: %s", rvalue); + return 0; + } + + *dhcp = s; + } + + return 0; +} + +static const char* const llmnr_support_table[_LLMNR_SUPPORT_MAX] = { + [LLMNR_SUPPORT_NO] = "no", + [LLMNR_SUPPORT_YES] = "yes", + [LLMNR_SUPPORT_RESOLVE] = "resolve", +}; + +DEFINE_STRING_TABLE_LOOKUP(llmnr_support, LLMNRSupport); + +int config_parse_llmnr( + 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) { + + LLMNRSupport *llmnr = data; + int k; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + /* Our enum shall be a superset of booleans, hence first try + * to parse as boolean, and then as enum */ + + k = parse_boolean(rvalue); + if (k > 0) + *llmnr = LLMNR_SUPPORT_YES; + else if (k == 0) + *llmnr = LLMNR_SUPPORT_NO; + else { + LLMNRSupport s; + + s = llmnr_support_from_string(rvalue); + if (s < 0){ + log_syntax(unit, LOG_ERR, filename, line, -s, "Failed to parse LLMNR option, ignoring: %s", rvalue); + return 0; + } + + *llmnr = s; + } return 0; }