X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=cc8ff6fda781625ce05ec5b19c973dac25739355;hp=bb0640589be5160e26b6e66ee45219727e594265;hb=5b9d4dc05560ddda89e48b6b39365824b15e1300;hpb=2a73e0d39a9bec82c3800071e375d27164727e71

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index bb0640589..cc8ff6fda 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -22,8 +22,9 @@
 #include <netinet/ether.h>
 #include <net/if.h>
 
-#include "link-config.h"
+#include "sd-id128.h"
 
+#include "link-config.h"
 #include "ethtool-util.h"
 
 #include "libudev-private.h"
@@ -34,6 +35,8 @@
 #include "path-util.h"
 #include "conf-parser.h"
 #include "conf-files.h"
+#include "fileio.h"
+#include "hashmap.h"
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);
@@ -43,11 +46,14 @@ struct link_config_ctx {
         sd_rtnl *rtnl;
 
         char **link_dirs;
-        usec_t *link_dirs_ts_usec;
+        usec_t link_dirs_ts_usec;
 };
 
+DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free);
+#define _cleanup_link_config_ctx_free_ _cleanup_(link_config_ctx_freep)
+
 int link_config_ctx_new(link_config_ctx **ret) {
-        link_config_ctx *ctx;
+        _cleanup_link_config_ctx_free_ link_config_ctx *ctx = NULL;
         int r;
 
         if (!ret)
@@ -58,41 +64,32 @@ int link_config_ctx_new(link_config_ctx **ret) {
                 return -ENOMEM;
 
         r = ethtool_connect(&ctx->ethtool_fd);
-        if (r < 0) {
-                link_config_ctx_free(ctx);
+        if (r < 0)
                 return r;
-        }
 
         r = sd_rtnl_open(0, &ctx->rtnl);
-        if (r < 0) {
-                link_config_ctx_free(ctx);
+        if (r < 0)
                 return r;
-        }
 
         LIST_HEAD_INIT(ctx->links);
 
-        ctx->link_dirs = strv_new("/etc/net/links",
-                                  "/run/net/links",
-                                  "/usr/lib/net/links",
+        ctx->link_dirs = strv_new("/etc/systemd/network",
+                                  "/run/systemd/network",
+                                  "/usr/lib/systemd/network",
                                   NULL);
         if (!ctx->link_dirs) {
                 log_error("failed to build link config directory array");
-                link_config_ctx_free(ctx);
                 return -ENOMEM;
         }
+
         if (!path_strv_canonicalize_uniq(ctx->link_dirs)) {
                 log_error("failed to canonicalize link config directories\n");
-                link_config_ctx_free(ctx);
-                return -ENOMEM;
-        }
-
-        ctx->link_dirs_ts_usec = calloc(strv_length(ctx->link_dirs), sizeof(usec_t));
-        if(!ctx->link_dirs_ts_usec) {
-                link_config_ctx_free(ctx);
                 return -ENOMEM;
         }
 
         *ret = ctx;
+        ctx = NULL;
+
         return 0;
 }
 
@@ -123,7 +120,6 @@ void link_config_ctx_free(link_config_ctx *ctx) {
         sd_rtnl_unref(ctx->rtnl);
 
         strv_free(ctx->link_dirs);
-        free(ctx->link_dirs_ts_usec);
         link_configs_free(ctx);
 
         free(ctx);
@@ -150,6 +146,11 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
                 goto failure;
         }
 
+        link->mac_policy = _MACPOLICY_INVALID;
+        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) {
@@ -175,8 +176,8 @@ int link_config_load(link_config_ctx *ctx) {
 
         link_configs_free(ctx);
 
-        /* update timestamps */
-        paths_check_timestamp(ctx->link_dirs, ctx->link_dirs_ts_usec, true);
+        /* update timestamp */
+        paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, true);
 
         r = conf_files_list_strv(&files, ".link", NULL, (const char **)ctx->link_dirs);
         if (r < 0) {
@@ -194,7 +195,7 @@ int link_config_load(link_config_ctx *ctx) {
 }
 
 bool link_config_should_reload(link_config_ctx *ctx) {
-        return paths_check_timestamp(ctx->link_dirs, ctx->link_dirs_ts_usec, false);
+        return paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, false);
 }
 
 static bool match_config(link_config *match, struct udev_device *device) {
@@ -202,32 +203,36 @@ static bool match_config(link_config *match, struct udev_device *device) {
 
         if (match->match_mac) {
                 property = udev_device_get_sysattr_value(device, "address");
-                if (!property || !streq(match->match_mac, property)) {
-                        log_debug("Device MAC address (%s) did not match MACAddress=%s", property, match->match_mac);
+                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 (!property || !streq(match->match_path, property)) {
-                        log_debug("Device's persistent path (%s) did not match Path=%s", property, match->match_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 (!property || !streq(match->match_driver, property)) {
-                        log_debug("Device driver (%s) did not match Driver=%s", property, match->match_driver);
+                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 (!property || !streq(match->match_type, property)) {
-                        log_debug("Device type (%s) did not match Type=%s", property, match->match_type);
+                if (!streq_ptr(match->match_type, property)) {
+                        log_debug("Device type (%s) did not match Type=%s",
+                                  property, match->match_type);
                         return 0;
                 }
         }
@@ -251,11 +256,9 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi
         return -ENOENT;
 }
 
-static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, const char *mac, unsigned int mtu) {
+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;
-        char new_name[IFNAMSIZ];
-        struct ether_addr new_mac;
-        bool need_update;
+        bool need_update = false;
         int r;
 
         assert(rtnl);
@@ -266,8 +269,7 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con
                 return r;
 
         if (name) {
-                strscpy(new_name, IFNAMSIZ, name);
-                r = sd_rtnl_message_append(message, IFLA_IFNAME, new_name);
+                r = sd_rtnl_message_append(message, IFLA_IFNAME, name);
                 if (r < 0)
                         return r;
 
@@ -275,16 +277,7 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con
         }
 
         if (mac) {
-                r = sscanf(mac, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-                           &new_mac.ether_addr_octet[0],
-                           &new_mac.ether_addr_octet[1],
-                           &new_mac.ether_addr_octet[2],
-                           &new_mac.ether_addr_octet[3],
-                           &new_mac.ether_addr_octet[4],
-                           &new_mac.ether_addr_octet[5]);
-                if (r != 6)
-                        return -EINVAL;
-                r = sd_rtnl_message_append(message, IFLA_ADDRESS, &new_mac);
+                r = sd_rtnl_message_append(message, IFLA_ADDRESS, mac);
                 if (r < 0)
                         return r;
 
@@ -300,7 +293,7 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con
         }
 
         if  (need_update) {
-                r = sd_rtnl_send_with_reply_and_block(rtnl, message, 250 * USEC_PER_MSEC, NULL);
+                r = sd_rtnl_send_with_reply_and_block(rtnl, message, 5 * USEC_PER_SEC, NULL);
                 if (r < 0)
                         return r;
         }
@@ -308,8 +301,103 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con
         return 0;
 }
 
+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;
+}
+
+static bool mac_is_random(struct udev_device *device) {
+        const char *s;
+        int type;
+
+        s = udev_device_get_sysattr_value(device, "addr_assign_type");
+        if (!s)
+                return -EINVAL;
+        type = strtoul(s, NULL, 0);
+
+        /* check for NET_ADDR_RANDOM */
+        return type == 1;
+}
+
+static bool mac_is_permanent(struct udev_device *device) {
+        const char *s;
+        int type;
+
+        s = udev_device_get_sysattr_value(device, "addr_assign_type");
+        if (!s)
+                return -EINVAL;
+        type = strtoul(s, NULL, 0);
+
+        /* check for NET_ADDR_PERM */
+        return type == 0;
+}
+
+static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) {
+        unsigned int seed;
+        int r, i;
+
+        if (want_random)
+                seed = random_u();
+        else {
+                const char *name;
+                sd_id128_t machine;
+                char machineid_buf[33];
+                const char *seed_str;
+
+                /* fetch some persistent data unique (on this machine) to this device */
+                name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD");
+                if (!name) {
+                        name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT");
+                        if (!name) {
+                                name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
+                                if (!name)
+                                        return -1;
+                        }
+                }
+                /* fetch some persistent data unique to this machine */
+                r = sd_id128_get_machine(&machine);
+                if (r < 0)
+                        return -1;
+
+                /* combine the data */
+                seed_str = strappenda(name, sd_id128_to_string(machine, machineid_buf));
+
+                /* hash to get seed */
+                seed = string_hash_func(seed_str);
+        }
+
+        srandom(seed);
+
+        for(i = 0; i < ETH_ALEN; i++) {
+                mac->ether_addr_octet[i] = random();
+        }
+
+        /* see eth_random_addr in the kernel */
+        mac->ether_addr_octet[0] &= 0xfe;        /* clear multicast bit */
+        mac->ether_addr_octet[0] |= 0x02;        /* set local assignment bit (IEEE802) */
+
+        return 0;
+}
+
 int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) {
         const char *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);
@@ -324,30 +412,17 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
                 if (r < 0)
                         log_warning("Could not set description of %s to '%s': %s",
                                     name, config->description, strerror(-r));
-                else
-                        log_info("Set link description of %s to '%s'", name,
-                                 config->description);
         }
 
-        if (config->speed || config->duplex) {
-                r = ethtool_set_speed(ctx->ethtool_fd, 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, config->duplex, strerror(-r));
-                else
-                        log_info("Set speed or duplex of %s to %u Mbytes (%s)", name,
-                                 config->speed, config->duplex);
-        }
+        r = ethtool_set_speed(ctx->ethtool_fd, 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));
 
-        if (config->wol) {
-                r = ethtool_set_wol(ctx->ethtool_fd, name, config->wol);
-                if (r < 0)
-                        log_warning("Could not set WakeOnLan of %s to %s: %s",
-                                    name, config->wol, strerror(-r));
-                else
-                        log_info("Set WakeOnLan of %s to %s", name, config->wol);
-        }
+        r = ethtool_set_wol(ctx->ethtool_fd, 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));
 
         ifindex = udev_device_get_ifindex(device);
         if (ifindex <= 0) {
@@ -355,9 +430,57 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
                 return -ENODEV;
         }
 
-        r = rtnl_set_properties(ctx->rtnl, ifindex, config->name, config->mac, config->mtu);
+        if (config->name_policy && enable_name_policy()) {
+                NamePolicy *policy;
+
+                for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) {
+                        switch (*policy) {
+                                case NAMEPOLICY_ONBOARD:
+                                        new_name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD");
+                                        break;
+                                case NAMEPOLICY_SLOT:
+                                        new_name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT");
+                                        break;
+                                case NAMEPOLICY_PATH:
+                                        new_name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
+                                        break;
+                                case NAMEPOLICY_MAC:
+                                        new_name = udev_device_get_property_value(device, "ID_NET_NAME_MAC");
+                                        break;
+                                default:
+                                        break;
+                        }
+                }
+        }
+
+        if (!new_name && config->name) {
+                new_name = config->name;
+        }
+
+        switch (config->mac_policy) {
+                case MACPOLICY_PERSISTENT:
+                        if (!mac_is_permanent(device)) {
+                                r = get_mac(device, false, &generated_mac);
+                                if (r < 0)
+                                        return r;
+                                mac = &generated_mac;
+                        }
+                        break;
+                case MACPOLICY_RANDOM:
+                        if (!mac_is_random(device)) {
+                                r = get_mac(device, true, &generated_mac);
+                                if (r < 0)
+                                        return r;
+                                mac = &generated_mac;
+                        }
+                        break;
+                default:
+                        mac = config->mac;
+        }
+
+        r = rtnl_set_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu);
         if (r < 0) {
-                log_warning("Could not set Name, MACAddress or MTU on %s", name);
+                log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r));
                 return r;
         }