networkd: unify handling of stacked netdevs

[elogind.git] / src / network / networkd-network.c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index eb3ff2316d0fc8dc4e94d54b6d2cff7500f39f75..7e753e15aff27f55b69ca16898825378f0163272 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -19,23 +19,38 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

+#include <ctype.h>
+#include <net/if.h>
+

 #include "networkd.h"
 #include "networkd.h"

-#include "net-util.h"
+#include "networkd-netdev.h"
+#include "network-internal.h"

 #include "path-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "path-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"

+#include "util.h"

 
 static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
         _cleanup_fclose_ FILE *file = NULL;
 
 static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
         _cleanup_fclose_ FILE *file = NULL;

+        Route *route;
+        Address *address;

         int r;
 
         int r;
 

+        assert(manager);
+        assert(filename);
+

         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
                         return 0;
                 else
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
                         return 0;
                 else

-                        return errno;
+                        return -errno;
+        }
+
+        if (null_or_empty_fd(fileno(file))) {
+                log_debug("Skipping empty file: %s", filename);
+                return 0;

         }
 
         network = new0(Network, 1);
         }
 
         network = new0(Network, 1);


@@ -44,8 +59,12 @@ static int network_load_one(Manager *manager, const char *filename) {
 
         network->manager = manager;
 
 
         network->manager = manager;
 

-        LIST_HEAD_INIT(network->addresses);
-        LIST_HEAD_INIT(network->routes);
+        LIST_HEAD_INIT(network->static_addresses);
+        LIST_HEAD_INIT(network->static_routes);
+
+        network->stacked_netdevs = hashmap_new(string_hash_func, string_compare_func);
+        if (!network->stacked_netdevs)
+                return log_oom();

 
         network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
         if (!network->addresses_by_section)
 
         network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
         if (!network->addresses_by_section)


@@ -59,15 +78,40 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->filename)
                 return log_oom();
 
         if (!network->filename)
                 return log_oom();
 

-        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\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));
+        network->ipv4ll_route = true;
+
+        network->dhcp_ntp = true;
+        network->dhcp_dns = true;
+        network->dhcp_hostname = true;
+        network->dhcp_domainname = true;
+        network->dhcp_routes = true;
+        network->dhcp_sendhost = true;
+
+        r = config_parse(NULL, filename, file,
+                         "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0",
+                         config_item_perf_lookup, network_network_gperf_lookup,
+                         false, false, true, network);
+        if (r < 0)

                 return r;
                 return r;

-        } else
-                log_debug("Parsed configuration file %s", filename);

 
         LIST_PREPEND(networks, manager->networks, network);
 
         LIST_PREPEND(networks, manager->networks, network);

+
+        LIST_FOREACH(routes, route, network->static_routes) {
+                if (!route->family) {
+                        log_warning("Route section without Gateway field configured in %s. "
+                                    "Ignoring", filename);
+                        return 0;
+                }
+        }
+
+        LIST_FOREACH(addresses, address, network->static_addresses) {
+                if (!address->family) {
+                        log_warning("Address section without Address field configured in %s. "
+                                    "Ignoring", filename);
+                        return 0;
+                }
+        }
+

         network = NULL;
 
         return 0;
         network = NULL;
 
         return 0;


@@ -75,7 +119,8 @@ static int network_load_one(Manager *manager, const char *filename) {
 
 int network_load(Manager *manager) {
         Network *network;
 
 int network_load(Manager *manager) {
         Network *network;

-        char **files, **f;
+        _cleanup_strv_free_ char **files = NULL;
+        char **f;

         int r;
 
         assert(manager);
         int r;
 
         assert(manager);


@@ -83,12 +128,9 @@ int network_load(Manager *manager) {
         while ((network = manager->networks))
                 network_free(network);
 
         while ((network = manager->networks))
                 network_free(network);
 

-        /* update timestamp */
-        paths_check_timestamp(manager->network_dirs, &manager->network_dirs_ts_usec, true);
-
-        r = conf_files_list_strv(&files, ".network", NULL, (const char **)manager->network_dirs);
+        r = conf_files_list_strv(&files, ".network", NULL, network_dirs);

         if (r < 0) {
         if (r < 0) {

-                log_error("failed to enumerate network files: %s", strerror(-r));
+                log_error("Failed to enumerate network files: %s", strerror(-r));

                 return r;
         }
 
                 return r;
         }
 


@@ -98,18 +140,14 @@ int network_load(Manager *manager) {
                         return r;
         }
 
                         return r;
         }
 

-        strv_free(files);
-

         return 0;
 }
 
         return 0;
 }
 

-bool network_should_reload(Manager *manager) {
-        return paths_check_timestamp(manager->network_dirs, &manager->network_dirs_ts_usec, false);
-}
-

 void network_free(Network *network) {
 void network_free(Network *network) {

+        NetDev *netdev;

         Route *route;
         Address *address;
         Route *route;
         Address *address;

+        Iterator i;

 
         if (!network)
                 return;
 
         if (!network)
                 return;


@@ -123,43 +161,61 @@ void network_free(Network *network) {
         free(network->match_name);
 
         free(network->description);
         free(network->match_name);
 
         free(network->description);

+        free(network->dhcp_vendor_class_identifier);
+
+        strv_free(network->ntp);
+        strv_free(network->dns);

 
 

-        while ((route = network->routes))
+        netdev_unref(network->bridge);
+
+        netdev_unref(network->bond);
+
+        HASHMAP_FOREACH(netdev, network->stacked_netdevs, i)
+                netdev_unref(netdev);
+        hashmap_free(network->stacked_netdevs);
+
+        while ((route = network->static_routes))

                 route_free(route);
 
                 route_free(route);
 

-        while ((address = network->addresses))
+        while ((address = network->static_addresses))

                 address_free(address);
 
         hashmap_free(network->addresses_by_section);
         hashmap_free(network->routes_by_section);
 
                 address_free(address);
 
         hashmap_free(network->addresses_by_section);
         hashmap_free(network->routes_by_section);
 

-        LIST_REMOVE(networks, network->manager->networks, network);
+        if (network->manager && network->manager->networks)
+                LIST_REMOVE(networks, network->manager->networks, network);
+
+        condition_free_list(network->match_host);
+        condition_free_list(network->match_virt);
+        condition_free_list(network->match_kernel);
+        condition_free_list(network->match_arch);

 
         free(network);
 }
 
 
         free(network);
 }
 

-int network_get(Manager *manager, struct udev_device *device, Network **ret) {
+int network_get(Manager *manager, struct udev_device *device,
+                const char *ifname, const struct ether_addr *address,
+                Network **ret) {

         Network *network;
 
         assert(manager);
         Network *network;
 
         assert(manager);

-        assert(device);

         assert(ret);
 
         assert(ret);
 

-        if (network_should_reload(manager))
-                network_load(manager);
-

         LIST_FOREACH(networks, network, manager->networks) {
                 if (net_match_config(network->match_mac, network->match_path,
         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,
-                                        udev_device_get_sysattr_value(device, "address"),
-                                        udev_device_get_property_value(device, "ID_PATH"),
-                                        udev_device_get_driver(device),
-                                        udev_device_get_devtype(device),
-                                        udev_device_get_sysname(device))) {
-                        log_debug("Network file %s applies to link %s",
-                                        network->filename,
-                                        udev_device_get_sysname(device));
+                                     network->match_driver, network->match_type,
+                                     network->match_name, network->match_host,
+                                     network->match_virt, network->match_kernel,
+                                     network->match_arch,
+                                     address,
+                                     udev_device_get_property_value(device, "ID_PATH"),
+                                     udev_device_get_driver(udev_device_get_parent(device)),
+                                     udev_device_get_property_value(device, "ID_NET_DRIVER"),
+                                     udev_device_get_devtype(device),
+                                     ifname)) {
+                        log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname,
+                                  network->filename);

                         *ret = network;
                         return 0;
                 }
                         *ret = network;
                         return 0;
                 }


@@ -173,14 +229,161 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
 int network_apply(Manager *manager, Network *network, Link *link) {
         int r;
 
 int network_apply(Manager *manager, Network *network, Link *link) {
         int r;
 

-        log_info("Network '%s' being applied to link '%ju'",
-                        network->description, link->ifindex);
-

         link->network = network;
 
         link->network = network;
 

-        r = link_configure(link);
-        if (r < 0)
-                return r;
+        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)
+                        return r;
+        }
+
+        return 0;
+}
+
+int config_parse_netdev(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;
+        _cleanup_free_ char *kind_string = NULL;
+        char *p;
+        NetDev *netdev;
+        NetDevKind kind;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        kind_string = strdup(lvalue);
+        if (!kind_string)
+                return log_oom();
+
+        /* the keys are CamelCase versions of the kind */
+        for (p = kind_string; *p; p++)
+                *p = tolower(*p);
+
+        kind = netdev_kind_from_string(kind_string);
+        if (kind == _NETDEV_KIND_INVALID) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "Invalid NetDev kind: %s", lvalue);
+                return 0;
+        }
+
+        r = netdev_get(network->manager, rvalue, &netdev);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "%s could not be found, ignoring assignment: %s", lvalue, rvalue);
+                return 0;
+        }
+
+        if (netdev->kind != kind) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "NetDev is not a %s, ignoring assignment: %s", lvalue, rvalue);
+                return 0;
+        }
+
+        switch (kind) {
+        case NETDEV_KIND_BRIDGE:
+                network->bridge = netdev;
+
+                break;
+        case NETDEV_KIND_BOND:
+                network->bond = netdev;
+
+                break;
+        case NETDEV_KIND_VLAN:
+        case NETDEV_KIND_MACVLAN:
+        case NETDEV_KIND_VXLAN:
+                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;
+                }
+
+                break;
+        default:
+                assert_not_reached("Can not parse NetDev");
+        }
+
+        netdev_ref(netdev);
+
+        return 0;
+}
+
+int config_parse_tunnel(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,
+                           "Tunnel is invalid, ignoring assignment: %s", rvalue);
+                return 0;
+        }
+
+        if (netdev->kind != NETDEV_KIND_IPIP &&
+            netdev->kind != NETDEV_KIND_SIT &&
+            netdev->kind != NETDEV_KIND_GRE &&
+            netdev->kind != NETDEV_KIND_VTI) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "NetDev is not a tunnel, ignoring assignment: %s", rvalue);
+                return 0;
+        }
+
+        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;
 }
 
         return 0;
 }