chiark / gitweb /
link-config: Fix typo in log_warning
[elogind.git] / src / udev / net / link-config.c
index cc8ff6fda781625ce05ec5b19c973dac25739355..5156ba6f8ad781c9fde6fae47a4ecad1d297c57b 100644 (file)
 #include "conf-files.h"
 #include "fileio.h"
 #include "hashmap.h"
+#include "rtnl-util.h"
+#include "net-util.h"
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);
 
         int ethtool_fd;
 
+        bool enable_name_policy;
+
         sd_rtnl *rtnl;
 
         char **link_dirs;
@@ -54,7 +58,6 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free);
 
 int link_config_ctx_new(link_config_ctx **ret) {
         _cleanup_link_config_ctx_free_ link_config_ctx *ctx = NULL;
-        int r;
 
         if (!ret)
                 return -EINVAL;
@@ -63,19 +66,18 @@ int link_config_ctx_new(link_config_ctx **ret) {
         if (!ctx)
                 return -ENOMEM;
 
-        r = ethtool_connect(&ctx->ethtool_fd);
-        if (r < 0)
-                return r;
+        LIST_HEAD_INIT(ctx->links);
 
-        r = sd_rtnl_open(0, &ctx->rtnl);
-        if (r < 0)
-                return r;
+        ctx->ethtool_fd = -1;
 
-        LIST_HEAD_INIT(ctx->links);
+        ctx->enable_name_policy = true;
 
         ctx->link_dirs = strv_new("/etc/systemd/network",
                                   "/run/systemd/network",
                                   "/usr/lib/systemd/network",
+#ifdef HAVE_SPLIT_USR
+                                  "/lib/systemd/network",
+#endif
                                   NULL);
         if (!ctx->link_dirs) {
                 log_error("failed to build link config directory array");
@@ -93,6 +95,23 @@ int link_config_ctx_new(link_config_ctx **ret) {
         return 0;
 }
 
+static int link_config_ctx_connect(link_config_ctx *ctx) {
+        int r;
+
+        if (ctx->ethtool_fd >= 0 && ctx->rtnl)
+                return 0;
+
+        r = ethtool_connect(&ctx->ethtool_fd);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_open(0, &ctx->rtnl);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
 static void link_configs_free(link_config_ctx *ctx) {
         link_config *link, *link_next;
 
@@ -150,14 +169,13 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         link->wol = _WOL_INVALID;
         link->duplex = _DUP_INVALID;
 
-
         r = config_parse(NULL, filename, file, "Match\0Link\0Ethernet\0", config_item_perf_lookup,
                          (void*) link_config_gperf_lookup, false, false, link);
         if (r < 0) {
-                log_warning("Colud not parse config file %s: %s", filename, strerror(-r));
+                log_warning("Could not parse config file %s: %s", filename, strerror(-r));
                 goto failure;
         } else
-                log_info("Parsed configuration file %s", filename);
+                log_debug("Parsed configuration file %s", filename);
 
         link->filename = strdup(filename);
 
@@ -170,12 +188,36 @@ failure:
         return r;
 }
 
+static bool enable_name_policy(void) {
+        _cleanup_free_ char *line;
+        char *w, *state;
+        int r;
+        size_t l;
+
+        r = proc_cmdline(&line);
+        if (r < 0)
+                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+        if (r <= 0)
+                return true;
+
+        FOREACH_WORD_QUOTED(w, l, line, state)
+                if (l == sizeof("net.ifnames=0") - 1 && strneq(w, "net.ifnames=0", l))
+                        return false;
+
+        return true;
+}
+
 int link_config_load(link_config_ctx *ctx) {
         int r;
         char **files, **f;
 
         link_configs_free(ctx);
 
+        if (!enable_name_policy()) {
+                ctx->enable_name_policy = false;
+                log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring.");
+        }
+
         /* update timestamp */
         paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, true);
 
@@ -198,136 +240,42 @@ bool link_config_should_reload(link_config_ctx *ctx) {
         return paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, false);
 }
 
-static bool match_config(link_config *match, struct udev_device *device) {
-        const char *property;
-
-        if (match->match_mac) {
-                property = udev_device_get_sysattr_value(device, "address");
-                if (!property || memcmp(match->match_mac, ether_aton(property), ETH_ALEN)) {
-                        log_debug("Device MAC address (%s) did not match MACAddress=%s",
-                                  property, ether_ntoa(match->match_mac));
-                        return 0;
-                }
-        }
-
-        if (match->match_path) {
-                property = udev_device_get_property_value(device, "ID_PATH");
-                if (!streq_ptr(match->match_path, property)) {
-                        log_debug("Device's persistent path (%s) did not match Path=%s",
-                                  property, match->match_path);
-                        return 0;
-                }
-        }
-
-        if (match->match_driver) {
-                property = udev_device_get_driver(device);
-                if (!streq_ptr(match->match_driver, property)) {
-                        log_debug("Device driver (%s) did not match Driver=%s",
-                                  property, match->match_driver);
-                        return 0;
-                }
-        }
-
-        if (match->match_type) {
-                property = udev_device_get_devtype(device);
-                if (!streq_ptr(match->match_type, property)) {
-                        log_debug("Device type (%s) did not match Type=%s",
-                                  property, match->match_type);
-                        return 0;
-                }
-        }
-
-        return 1;
-}
-
 int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config **ret) {
         link_config *link;
 
         LIST_FOREACH(links, link, ctx->links) {
-                if (!match_config(link, device)) {
-                        log_info("Config file %s does not apply to device %s", link->filename, udev_device_get_sysname(device));
-                } else {
-                        log_info("Config file %s applies to device %s", link->filename, udev_device_get_sysname(device));
+
+                if (net_match_config(link->match_mac, link->match_path,
+                                     link->match_driver, link->match_type, NULL,
+                                     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),
+                                     NULL)) {
+                        log_debug("Config file %s applies to device %s",
+                                  link->filename,
+                                  udev_device_get_sysname(device));
                         *ret = link;
                         return 0;
                 }
         }
 
-        return -ENOENT;
-}
-
-static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, const struct ether_addr *mac, unsigned int mtu) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message;
-        bool need_update = false;
-        int r;
-
-        assert(rtnl);
-        assert(ifindex > 0);
-
-        r = sd_rtnl_message_link_new(RTM_NEWLINK, ifindex, 0, 0, &message);
-        if (r < 0)
-                return r;
-
-        if (name) {
-                r = sd_rtnl_message_append(message, IFLA_IFNAME, name);
-                if (r < 0)
-                        return r;
-
-                need_update = true;
-        }
-
-        if (mac) {
-                r = sd_rtnl_message_append(message, IFLA_ADDRESS, mac);
-                if (r < 0)
-                        return r;
-
-                need_update = true;
-        }
-
-        if (mtu > 0) {
-                r = sd_rtnl_message_append(message, IFLA_MTU, &mtu);
-                if (r < 0)
-                        return r;
-
-                need_update = true;
-        }
-
-        if  (need_update) {
-                r = sd_rtnl_send_with_reply_and_block(rtnl, message, 5 * USEC_PER_SEC, NULL);
-                if (r < 0)
-                        return r;
-        }
-
-        return 0;
-}
+        *ret = NULL;
 
-static bool enable_name_policy(void) {
-        _cleanup_free_ char *line;
-        char *w, *state;
-        int r;
-        size_t l;
-
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-                return true; /* something is very wrong, let's not make it worse */
-        }
-
-        FOREACH_WORD_QUOTED(w, l, line, state)
-                if (strneq(w, "net.ifnames=0", l))
-                        return false;
-
-        return true;
+        return -ENOENT;
 }
 
 static bool mac_is_random(struct udev_device *device) {
         const char *s;
-        int type;
+        unsigned type;
+        int r;
 
         s = udev_device_get_sysattr_value(device, "addr_assign_type");
         if (!s)
-                return -EINVAL;
-        type = strtoul(s, NULL, 0);
+                return false; /* if we don't know, assume it is not random */
+        r = safe_atou(s, &type);
+        if (r < 0)
+                return false;
 
         /* check for NET_ADDR_RANDOM */
         return type == 1;
@@ -335,12 +283,15 @@ static bool mac_is_random(struct udev_device *device) {
 
 static bool mac_is_permanent(struct udev_device *device) {
         const char *s;
-        int type;
+        unsigned type;
+        int r;
 
         s = udev_device_get_sysattr_value(device, "addr_assign_type");
         if (!s)
-                return -EINVAL;
-        type = strtoul(s, NULL, 0);
+                return true; /* if we don't know, assume it is permanent */
+        r = safe_atou(s, &type);
+        if (r < 0)
+                return true;
 
         /* check for NET_ADDR_PERM */
         return type == 0;
@@ -365,13 +316,13 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad
                         if (!name) {
                                 name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
                                 if (!name)
-                                        return -1;
+                                        return -ENOENT;
                         }
                 }
                 /* fetch some persistent data unique to this machine */
                 r = sd_id128_get_machine(&machine);
                 if (r < 0)
-                        return -1;
+                        return r;
 
                 /* combine the data */
                 seed_str = strappenda(name, sd_id128_to_string(machine, machineid_buf));
@@ -393,36 +344,43 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad
         return 0;
 }
 
-int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) {
-        const char *name;
+int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device, const char **name) {
+        const char *old_name;
         const char *new_name = NULL;
         struct ether_addr generated_mac;
         struct ether_addr *mac = NULL;
         int r, ifindex;
 
-        name = udev_device_get_sysname(device);
-        if (!name)
-                return -EINVAL;
+        assert(ctx);
+        assert(config);
+        assert(device);
+        assert(name);
 
-        log_info("Configuring %s", name);
+        r = link_config_ctx_connect(ctx);
+        if (r < 0)
+                return r;
+
+        old_name = udev_device_get_sysname(device);
+        if (!old_name)
+                return -EINVAL;
 
         if (config->description) {
                 r = udev_device_set_sysattr_value(device, "ifalias",
                                                   config->description);
                 if (r < 0)
                         log_warning("Could not set description of %s to '%s': %s",
-                                    name, config->description, strerror(-r));
+                                    old_name, config->description, strerror(-r));
         }
 
-        r = ethtool_set_speed(ctx->ethtool_fd, name, config->speed, config->duplex);
+        r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed, config->duplex);
         if (r < 0)
                 log_warning("Could not set speed or duplex of %s to %u Mbytes (%s): %s",
-                             name, config->speed, duplex_to_string(config->duplex), strerror(-r));
+                             old_name, config->speed, duplex_to_string(config->duplex), strerror(-r));
 
-        r = ethtool_set_wol(ctx->ethtool_fd, name, config->wol);
+        r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol);
         if (r < 0)
                 log_warning("Could not set WakeOnLan of %s to %s: %s",
-                            name, wol_to_string(config->wol), strerror(-r));
+                            old_name, wol_to_string(config->wol), strerror(-r));
 
         ifindex = udev_device_get_ifindex(device);
         if (ifindex <= 0) {
@@ -430,7 +388,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
                 return -ENODEV;
         }
 
-        if (config->name_policy && enable_name_policy()) {
+        if (ctx->enable_name_policy && config->name_policy) {
                 NamePolicy *policy;
 
                 for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) {
@@ -453,9 +411,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
                 }
         }
 
-        if (!new_name && config->name) {
-                new_name = config->name;
-        }
+        if (new_name)
+                *name = new_name; /* a name was set by a policy */
+        else if (config->name)
+                *name = config->name; /* a name was set manually in the config */
+        else
+                *name = NULL;
 
         switch (config->mac_policy) {
                 case MACPOLICY_PERSISTENT:
@@ -478,11 +439,29 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
                         mac = config->mac;
         }
 
-        r = rtnl_set_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu);
+        r = rtnl_set_link_properties(ctx->rtnl, ifindex, mac, config->mtu);
         if (r < 0) {
-                log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r));
+                log_warning("Could not set MACAddress or MTU on %s: %s", old_name, strerror(-r));
                 return r;
         }
 
         return 0;
 }
+
+static const char* const mac_policy_table[] = {
+        [MACPOLICY_PERSISTENT] = "persistent",
+        [MACPOLICY_RANDOM] = "random"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
+
+static const char* const name_policy_table[] = {
+        [NAMEPOLICY_ONBOARD] = "onboard",
+        [NAMEPOLICY_SLOT] = "slot",
+        [NAMEPOLICY_PATH] = "path",
+        [NAMEPOLICY_MAC] = "mac"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(name_policy, NamePolicy);
+DEFINE_CONFIG_PARSE_ENUMV(config_parse_name_policy, name_policy, NamePolicy, _NAMEPOLICY_INVALID, "Failed to parse interface name policy");