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=47fab4ecb043defad9745664413f6c5573ac8c5d;hp=f9873100114f5a8186c4ead70f170be8990a0184;hb=ee0e4cca5ac37a094dfe1074907dae70c7b7701c;hpb=3bef724f7e7f7eaca69881548b06e221b77d7031 diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index f98731001..47fab4ecb 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -20,7 +20,7 @@ ***/ #include "networkd.h" -#include "net-util.h" +#include "network-internal.h" #include "path-util.h" #include "conf-files.h" #include "conf-parser.h" @@ -53,6 +53,14 @@ 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) + 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); if (!network->addresses_by_section) return log_oom(); @@ -61,12 +69,20 @@ 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(); - r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0", config_item_perf_lookup, - (void*) network_gperf_lookup, false, false, network); + 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)); return r; @@ -80,12 +96,6 @@ static int network_load_one(Manager *manager, const char *filename) { "Ignoring", filename); return 0; } - - if (route->dst_family && route->family != route->dst_family) { - log_warning("Route section with conflicting Gateway and Destination address " - "family configured in %s. Ignoring", filename); - return 0; - } } LIST_FOREACH(static_addresses, address, network->static_addresses) { @@ -130,6 +140,7 @@ int network_load(Manager *manager) { void network_free(Network *network) { Route *route; Address *address; + Iterator i; if (!network) return; @@ -144,7 +155,14 @@ void network_free(Network *network) { free(network->description); - address_free(network->dns); + SET_FOREACH(address, network->dns, i) + address_free(address); + + set_free(network->dns); + + hashmap_free(network->vlans); + + hashmap_free(network->macvlans); while ((route = network->static_routes)) route_free(route); @@ -158,6 +176,11 @@ void network_free(Network *network) { if (network->manager && network->manager->networks) LIST_REMOVE(networks, network->manager->networks, network); + condition_free_list(network->match_host); + condition_free_list(network->match_virt); + condition_free_list(network->match_kernel); + condition_free_list(network->match_arch); + free(network); } @@ -171,10 +194,13 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) { LIST_FOREACH(networks, network, manager->networks) { if (net_match_config(network->match_mac, network->match_path, network->match_driver, network->match_type, - network->match_name, + network->match_name, network->match_host, + network->match_virt, network->match_kernel, + network->match_arch, udev_device_get_sysattr_value(device, "address"), udev_device_get_property_value(device, "ID_PATH"), - udev_device_get_driver(device), + udev_device_get_driver(udev_device_get_parent(device)), + udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), udev_device_get_sysname(device))) { log_debug("%s: found matching network '%s'", @@ -195,10 +221,6 @@ int network_apply(Manager *manager, Network *network, Link *link) { link->network = network; - r = link_configure(link); - if (r < 0) - return r; - if (network->dns) { r = manager_update_resolv_conf(manager); if (r < 0) @@ -219,7 +241,7 @@ int config_parse_bridge(const char *unit, void *data, void *userdata) { Network *network = userdata; - Bridge *bridge; + NetDev *netdev; int r; assert(filename); @@ -227,14 +249,141 @@ int config_parse_bridge(const char *unit, assert(rvalue); assert(data); - r = bridge_get(network->manager, rvalue, &bridge); + r = netdev_get(network->manager, rvalue, &netdev); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Bridge is invalid, ignoring assignment: %s", rvalue); return 0; } - network->bridge = bridge; + if (netdev->kind != NETDEV_KIND_BRIDGE) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "NetDev is not a bridge, ignoring assignment: %s", rvalue); + return 0; + } + + network->bridge = netdev; + + return 0; +} + +int config_parse_bond(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, + "Bond is invalid, ignoring assignment: %s", rvalue); + return 0; + } + + if (netdev->kind != NETDEV_KIND_BOND) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "NetDev is not a bond, ignoring assignment: %s", rvalue); + return 0; + } + + network->bond = netdev; + + return 0; +} + +int config_parse_vlan(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, + "VLAN is invalid, ignoring assignment: %s", rvalue); + return 0; + } + + if (netdev->kind != NETDEV_KIND_VLAN) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "NetDev is not a VLAN, ignoring assignment: %s", rvalue); + return 0; + } + + 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; + } + + return 0; +} + +int config_parse_macvlan(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, + "MACVLAN is invalid, ignoring assignment: %s", rvalue); + return 0; + } + + if (netdev->kind != NETDEV_KIND_MACVLAN) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "NetDev is not a MACVLAN, ignoring assignment: %s", rvalue); + return 0; + } + + r = hashmap_put(network->macvlans, netdev->name, netdev); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Can not add MACVLAN to network: %s", rvalue); + return 0; + } return 0; }