X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=056e063f26a79a2e9b9e272dd8a6fbc868519eb1;hb=bd8f65387673e29f46136a4ed172097035002c23;hp=24fc26b92931db81c817776335e1e911eb12679d;hpb=b0e39c8284b5195850a58e4efcce2f059bdcc6ad;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 24fc26b92..056e063f2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -62,23 +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(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); + 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(); @@ -86,6 +78,9 @@ 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; @@ -93,6 +88,8 @@ static int network_load_one(Manager *manager, const char *filename) { network->dhcp_routes = true; network->dhcp_sendhost = true; + 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, @@ -176,19 +173,9 @@ void network_free(Network *network) { netdev_unref(network->bond); - netdev_unref(network->tunnel); - - 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_FOREACH(netdev, network->vxlans, i) - netdev_unref(netdev); - hashmap_free(network->vxlans); + hashmap_free(network->stacked_netdevs); while ((route = network->static_routes)) route_free(route); @@ -247,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) @@ -316,30 +323,12 @@ int config_parse_netdev(const char *unit, break; case NETDEV_KIND_VLAN: - r = hashmap_put(network->vlans, 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; - } - - break; case NETDEV_KIND_MACVLAN: - 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); + r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Can not add VXLAN '%s' to network: %s", + "Can not add VLAN '%s' to network: %s", rvalue, strerror(-r)); return 0; } @@ -389,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; }