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: <http://avahi.org/wiki/AvahiAutoipd#Routes>

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 7c5f69895a7e1c5e544f0aa32dd059338a4734a1..dc34154b26168f2cedc60938cf43fdfcf3b1eff6 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -218,6 +218,15 @@
                                                 </para>
                                         </listitem>
                                 </varlistentry>
                                                 </para>
                                         </listitem>
                                 </varlistentry>

+                                <varlistentry>
+                                        <term><varname>IPv4LLRoute=</varname></term>
+                                        <listitem>
+                                                <para>A boolean. When true, sets up the route needed for
+                                                non-IPv4LL hosts to communicate with IPv4LL-only hosts. Defaults
+                                                to true.
+                                                </para>
+                                        </listitem>
+                                </varlistentry>

                                 <varlistentry>
                                         <term><varname>Address=</varname></term>
                                         <listitem>
                                 <varlistentry>
                                         <term><varname>Address=</varname></term>
                                         <listitem>

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 2938f8aec35c7beccdf9aac54a8e378753235e62..852142f4de599a91adaac64afecfb8330e644a7c 100644 (file)
--- 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.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)
 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 24fc26b92931db81c817776335e1e911eb12679d..84b6973f55c9b5012252ee7a571b19ed59097f54 100644 (file)
--- 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();
 
         if (!network->filename)
                 return log_oom();
 

+        network->ipv4ll_route = true;
+

         network->dhcp_ntp = true;
         network->dhcp_dns = true;
         network->dhcp_hostname = 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;
 
 
         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)
         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 bae2852845e9795ce7eac4330db3ca41e6cab026..138b82d786e0873c8ca7c5639a3c0a1de1ebccaa 100644 (file)
--- 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 dhcp_critical;
         bool dhcp_routes;
         bool ipv4ll;

+        bool ipv4ll_route;

 
         bool dhcp_server;
 
 
         bool dhcp_server;