X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=fd1befcebffcce019893b73226d9add99e8ed5de;hb=2cc412b59353576cece2d5b30c6a39c70552f0a0;hp=1606042264b584758f9a7cd7b80076d17c1acc4b;hpb=2ad8416dd057e7e3185169609ca3006e7649f576;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 160604226..fd1befceb 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -53,6 +53,10 @@ 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(uint64_hash_func, uint64_compare_func); + if (!network->vlans) + return log_oom(); + network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func); if (!network->addresses_by_section) return log_oom(); @@ -65,7 +69,11 @@ static int network_load_one(Manager *manager, const char *filename) { if (!network->filename) return log_oom(); - r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0", config_item_perf_lookup, + 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_gperf_lookup, false, false, network); if (r < 0) { log_warning("Could not parse config file %s: %s", filename, strerror(-r)); @@ -80,12 +88,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) { @@ -144,6 +146,10 @@ void network_free(Network *network) { free(network->description); + address_free(network->dns); + + hashmap_free(network->vlans); + while ((route = network->static_routes)) route_free(route); @@ -166,16 +172,14 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) { assert(device); assert(ret); - if (manager_should_reload(manager)) - manager_load_config(manager); - 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, 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_devtype(device), udev_device_get_sysname(device))) { log_debug("%s: found matching network '%s'", @@ -200,6 +204,12 @@ int network_apply(Manager *manager, Network *network, Link *link) { if (r < 0) return r; + if (network->dns) { + r = manager_update_resolv_conf(manager); + if (r < 0) + return r; + } + return 0; } @@ -214,7 +224,7 @@ int config_parse_bridge(const char *unit, void *data, void *userdata) { Network *network = userdata; - Bridge *bridge; + NetDev *netdev; int r; assert(filename); @@ -222,14 +232,99 @@ 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; }