X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=bd97cd8cf87d2672db439141aea1a440b22d2e00;hb=2ad8416dd057e7e3185169609ca3006e7649f576;hp=b26825427625e46b9397c2e3e8896edf29fc2fb8;hpb=f61942250a43a123580d7bbe5d7873dc5118ed97;p=elogind.git diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index b26825427..bd97cd8cf 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -38,6 +38,8 @@ #include "fileio.h" #include "hashmap.h" #include "rtnl-util.h" +#include "net-util.h" +#include "siphash24.h" struct link_config_ctx { LIST_HEAD(link_config, links); @@ -48,10 +50,18 @@ struct link_config_ctx { sd_rtnl *rtnl; - char **link_dirs; usec_t link_dirs_ts_usec; }; +static const char* const link_dirs[] = { + "/etc/systemd/network", + "/run/systemd/network", + "/usr/lib/systemd/network", +#ifdef HAVE_SPLIT_USR + "/lib/systemd/network", +#endif + NULL}; + DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free); #define _cleanup_link_config_ctx_free_ _cleanup_(link_config_ctx_freep) @@ -71,20 +81,6 @@ int link_config_ctx_new(link_config_ctx **ret) { ctx->enable_name_policy = true; - 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"); - return -ENOMEM; - } - - if (!path_strv_canonicalize_uniq(ctx->link_dirs)) { - log_error("failed to canonicalize link config directories\n"); - return -ENOMEM; - } - *ret = ctx; ctx = NULL; @@ -120,6 +116,7 @@ static void link_configs_free(link_config_ctx *ctx) { free(link->match_driver); free(link->match_type); free(link->description); + free(link->alias); free(link); } @@ -134,7 +131,6 @@ void link_config_ctx_free(link_config_ctx *ctx) { sd_rtnl_unref(ctx->rtnl); - strv_free(ctx->link_dirs); link_configs_free(ctx); free(ctx); @@ -144,9 +140,12 @@ void link_config_ctx_free(link_config_ctx *ctx) { static int load_link(link_config_ctx *ctx, const char *filename) { link_config *link; - FILE *file; + _cleanup_fclose_ FILE *file; int r; + assert(ctx); + assert(filename); + file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) @@ -165,14 +164,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); @@ -191,11 +189,11 @@ static bool enable_name_policy(void) { int r; size_t l; - r = read_one_line_file("/proc/cmdline", &line); - if (r < 0) { + r = 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 */ - } + if (r <= 0) + return true; FOREACH_WORD_QUOTED(w, l, line, state) if (strneq(w, "net.ifnames=0", l)) @@ -210,16 +208,15 @@ int link_config_load(link_config_ctx *ctx) { 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); + paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true); - r = conf_files_list_strv(&files, ".link", NULL, (const char **)ctx->link_dirs); + r = conf_files_list_strv(&files, ".link", NULL, link_dirs); if (r < 0) { log_error("failed to enumerate link files: %s", strerror(-r)); return r; @@ -235,62 +232,31 @@ 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); -} - -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; + return paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, false); } 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_debug("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; } } + *ret = NULL; + return -ENOENT; } @@ -326,17 +292,18 @@ static bool mac_is_permanent(struct udev_device *device) { return type == 0; } +#define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a) + static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) { - unsigned int seed; - int r, i; + int r; if (want_random) - seed = random_u(); + random_bytes(mac->ether_addr_octet, ETH_ALEN); else { const char *name; - sd_id128_t machine; - char machineid_buf[33]; - const char *seed_str; + uint8_t result[8]; + size_t l, sz; + uint8_t *v; /* fetch some persistent data unique (on this machine) to this device */ name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"); @@ -348,22 +315,24 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad return -ENOENT; } } + + l = strlen(name); + sz = sizeof(sd_id128_t) + l; + v = alloca(sz); + /* fetch some persistent data unique to this machine */ - r = sd_id128_get_machine(&machine); + r = sd_id128_get_machine((sd_id128_t*) v); if (r < 0) return r; + memcpy(v + sizeof(sd_id128_t), name, l); - /* 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); + /* Let's hash the machine ID plus the device name. We + * use a fixed, but originally randomly created hash + * key here. */ + siphash24(result, v, sz, HASH_KEY.bytes); - for(i = 0; i < ETH_ALEN; i++) { - mac->ether_addr_octet[i] = random(); + assert_cc(ETH_ALEN <= sizeof(result)); + memcpy(mac->ether_addr_octet, result, ETH_ALEN); } /* see eth_random_addr in the kernel */ @@ -393,14 +362,6 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev 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", - old_name, config->description, strerror(-r)); - } - 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", @@ -468,11 +429,29 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, mac, config->mtu); + r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, config->mtu); if (r < 0) { - log_warning("Could not set MACAddress or MTU on %s: %s", old_name, strerror(-r)); + log_warning("Could not set Alias, 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");