[systemd-commits] 2 commits - man/systemd.network.xml src/network

[Tom Gundersen]

 man/systemd.network.xml                  |    9 +++++++++
 src/network/networkd-link.c              |    8 --------
 src/network/networkd-network-gperf.gperf |    1 +
 src/network/networkd-network.c           |   22 ++++++++++++++++++++++
 src/network/networkd.h                   |    1 +
 5 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit bfa695b5cc37aeb78737c57c84e9e69ea08152c0
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri Jul 25 02:09:29 2014 +0200

    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 7c5f698..dc34154 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -219,6 +219,15 @@
                                         </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>
                                                 <para>A static IPv4 or IPv6 address and its prefix length,
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 2938f8a..852142f 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 24fc26b..84b6973 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 bae2852..138b82d 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;
 

commit 3c072310d515dd7ab4d553001ed3eb34b8090002
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri Jul 25 01:28:39 2014 +0200

    networkd: ipv4ll - drop unnecessary get_address()

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7e6bc7b..c346df4 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -471,14 +471,6 @@ static int link_enter_set_routes(Link *link) {
 
         if (link->ipv4ll && !link->dhcp_lease) {
                 _cleanup_route_free_ Route *route = NULL;
-                struct in_addr addr;
-
-                r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
-                if (r < 0 && r != -ENOENT) {
-                        log_warning_link(link, "IPV4LL error: no address: %s",
-                                        strerror(-r));
-                        return r;
-                }
 
                 if (r != -ENOENT) {
                         r = route_new_dynamic(&route, RTPROT_STATIC);