X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=bc9304291e7a9e689484bc1b4fa4e16768921b4a;hb=aa9f11405829fd4755fef28602a7167dba3ddc89;hp=a452096836bd6160e7da413ba0809a32b95acefc;hpb=47e2dc3168cb0509d8d61f5dbeffaa3c252685b5;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index a45209683..bc9304291 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; } @@ -64,10 +66,14 @@ static int network_load_one(Manager *manager, const char *filename) { if (!network->vlans) return log_oom(); - network->macvlans = hashmap_new(uint64_hash_func, uint64_compare_func); + network->macvlans = hashmap_new(string_hash_func, string_compare_func); if (!network->macvlans) return log_oom(); + network->vxlans = hashmap_new(string_hash_func, string_compare_func); + if (!network->vxlans) + return log_oom(); + network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func); if (!network->addresses_by_section) return log_oom(); @@ -76,28 +82,27 @@ static int network_load_one(Manager *manager, const char *filename) { 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->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 +110,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,16 +167,24 @@ void network_free(Network *network) { free(network->match_name); free(network->description); + free(network->dhcp_vendor_class_identifier); - SET_FOREACH(address, network->dns, i) + while ((address = network->ntp)) { + LIST_REMOVE(addresses, network->ntp, address); address_free(address); + } - set_free(network->dns); + while ((address = network->dns)) { + LIST_REMOVE(addresses, network->dns, address); + address_free(address); + } netdev_unref(network->bridge); netdev_unref(network->bond); + netdev_unref(network->tunnel); + HASHMAP_FOREACH(netdev, network->vlans, i) netdev_unref(netdev); hashmap_free(network->vlans); @@ -180,6 +193,10 @@ void network_free(Network *network) { netdev_unref(netdev); hashmap_free(network->macvlans); + HASHMAP_FOREACH(netdev, network->vxlans, i) + netdev_unref(netdev); + hashmap_free(network->vxlans); + while ((route = network->static_routes)) route_free(route); @@ -220,7 +237,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 +254,8 @@ int network_apply(Manager *manager, Network *network, Link *link) { link->network = network; - if (network->dns) { - r = manager_update_resolv_conf(manager); + if (network->dns || network->ntp) { + r = link_save(link); if (r < 0) return r; } @@ -257,7 +274,8 @@ int config_parse_netdev(const char *unit, void *data, void *userdata) { Network *network = userdata; - char *kind_string, *p; + _cleanup_free_ char *kind_string = NULL; + char *p; NetDev *netdev; NetDevKind kind; int r; @@ -305,19 +323,31 @@ int config_parse_netdev(const char *unit, break; case NETDEV_KIND_VLAN: - r = hashmap_put(network->vlans, &netdev->vlanid, netdev); + r = hashmap_put(network->vlans, netdev->ifname, netdev); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Can not add VLAN to network: %s", rvalue); + "Can not add VLAN '%s' to network: %s", + rvalue, strerror(-r)); return 0; } break; case NETDEV_KIND_MACVLAN: - r = hashmap_put(network->macvlans, netdev->name, netdev); + r = hashmap_put(network->macvlans, netdev->ifname, netdev); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Can not add MACVLAN '%s' to network: %s", + rvalue, strerror(-r)); + return 0; + } + + break; + case NETDEV_KIND_VXLAN: + r = hashmap_put(network->vxlans, 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 VXLAN '%s' to network: %s", + rvalue, strerror(-r)); return 0; } @@ -330,3 +360,43 @@ int config_parse_netdev(const char *unit, return 0; } + +int config_parse_tunnel(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; + NetDev *netdev; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + r = netdev_get(network->manager, rvalue, &netdev); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Tunnel is invalid, ignoring assignment: %s", rvalue); + return 0; + } + + if (netdev->kind != NETDEV_KIND_IPIP && + netdev->kind != NETDEV_KIND_SIT && + 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; + + return 0; +}