From bfa695b5cc37aeb78737c57c84e9e69ea08152c0 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 25 Jul 2014 02:09:29 +0200 Subject: [PATCH] networkd: ipv4ll - default to setting up ipv4ll routes This is necessary for non-ipv4ll hosts to communicate with ipv4ll-only hosts on the same link. Defaults to being enabled, but can be opted out. See: --- man/systemd.network.xml | 9 +++++++++ src/network/networkd-network-gperf.gperf | 1 + src/network/networkd-network.c | 22 ++++++++++++++++++++++ src/network/networkd.h | 1 + 4 files changed, 33 insertions(+) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 7c5f69895..dc34154b2 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -218,6 +218,15 @@ + + IPv4LLRoute= + + A boolean. When true, sets up the route needed for + non-IPv4LL hosts to communicate with IPv4LL-only hosts. Defaults + to true. + + + Address= diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 2938f8aec..852142f4d 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -33,6 +33,7 @@ Network.VXLAN, config_parse_netdev, 0, Network.DHCP, config_parse_dhcp, 0, offsetof(Network, dhcp) Network.DHCPServer, config_parse_bool, 0, offsetof(Network, dhcp_server) Network.IPv4LL, config_parse_bool, 0, offsetof(Network, ipv4ll) +Network.IPv4LLRoute, config_parse_bool, 0, offsetof(Network, ipv4ll_route) Network.Address, config_parse_address, 0, 0 Network.Gateway, config_parse_gateway, 0, 0 Network.DNS, config_parse_strv, 0, offsetof(Network, dns) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 24fc26b92..84b6973f5 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -86,6 +86,8 @@ static int network_load_one(Manager *manager, const char *filename) { if (!network->filename) return log_oom(); + network->ipv4ll_route = true; + network->dhcp_ntp = true; network->dhcp_dns = true; network->dhcp_hostname = true; @@ -247,6 +249,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) diff --git a/src/network/networkd.h b/src/network/networkd.h index bae285284..138b82d78 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -96,6 +96,7 @@ struct Network { bool dhcp_critical; bool dhcp_routes; bool ipv4ll; + bool ipv4ll_route; bool dhcp_server; -- 2.30.2