X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=c99dab809b71054d27196710e41fb28d18e9dcd0;hb=70b34f5de86809991d6753ba486b88481ceab817;hp=91b1e3c7bdbc20ee31a21cecd8680abedc2b5529;hpb=af4e9e2c563047d524b207e0e3d6816385693a16;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 91b1e3c7b..c99dab809 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -20,8 +20,10 @@ ***/ #include +#include #include "networkd.h" +#include "networkd-netdev.h" #include "network-internal.h" #include "path-util.h" #include "conf-files.h" @@ -46,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; } @@ -60,44 +62,41 @@ 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(); - network->dns = set_new(NULL, NULL); - if (!network->dns) - return log_oom(); - network->filename = strdup(filename); if (!network->filename) return log_oom(); + network->ipv4ll_route = true; + + network->dhcp_ntp = true; network->dhcp_dns = true; network->dhcp_hostname = true; network->dhcp_domainname = 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->dhcp_routes = true; + network->dhcp_sendhost = true; + + 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); - LIST_FOREACH(static_routes, route, network->static_routes) { + LIST_FOREACH(routes, route, network->static_routes) { if (!route->family) { log_warning("Route section without Gateway field configured in %s. " "Ignoring", filename); @@ -105,7 +104,7 @@ static int network_load_one(Manager *manager, const char *filename) { } } - LIST_FOREACH(static_addresses, address, network->static_addresses) { + LIST_FOREACH(addresses, address, network->static_addresses) { if (!address->family) { log_warning("Address section without Address field configured in %s. " "Ignoring", filename); @@ -162,23 +161,18 @@ void network_free(Network *network) { free(network->match_name); free(network->description); + free(network->dhcp_vendor_class_identifier); - SET_FOREACH(address, network->dns, i) - address_free(address); - - set_free(network->dns); + strv_free(network->ntp); + strv_free(network->dns); netdev_unref(network->bridge); netdev_unref(network->bond); - HASHMAP_FOREACH(netdev, network->vlans, i) - netdev_unref(netdev); - hashmap_free(network->vlans); - - HASHMAP_FOREACH(netdev, network->macvlans, i) + HASHMAP_FOREACH(netdev, network->stacked_netdevs, i) netdev_unref(netdev); - hashmap_free(network->macvlans); + hashmap_free(network->stacked_netdevs); while ((route = network->static_routes)) route_free(route); @@ -220,7 +214,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'", ifname, + log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename); *ret = network; return 0; @@ -237,8 +231,28 @@ int network_apply(Manager *manager, Network *network, Link *link) { link->network = network; - if (network->dns) { - r = manager_update_resolv_conf(manager); + 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) return r; } @@ -306,19 +320,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; } @@ -360,13 +368,22 @@ int config_parse_tunnel(const char *unit, if (netdev->kind != NETDEV_KIND_IPIP && netdev->kind != NETDEV_KIND_SIT && - netdev->kind != NETDEV_KIND_GRE) { + netdev->kind != NETDEV_KIND_GRE && + netdev->kind != NETDEV_KIND_VTI) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, "NetDev is not a tunnel, ignoring assignment: %s", rvalue); 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; }