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=15bea4f4caa3cd089288bcddc09f67b1586c228c;hp=089bd76564e4d09371171abadd8dcb310ea3a13c;hb=2cc412b59353576cece2d5b30c6a39c70552f0a0;hpb=16b9b87aeee9353b5b8dae6089a69752422a5b09 diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 089bd7656..15bea4f4c 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -37,21 +37,36 @@ #include "conf-files.h" #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); int ethtool_fd; + bool enable_name_policy; + sd_rtnl *rtnl; - char **link_dirs; - usec_t *link_dirs_ts_usec; + 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) + int link_config_ctx_new(link_config_ctx **ret) { - link_config_ctx *ctx; - int r; + _cleanup_link_config_ctx_free_ link_config_ctx *ctx = NULL; if (!ret) return -EINVAL; @@ -60,42 +75,32 @@ int link_config_ctx_new(link_config_ctx **ret) { if (!ctx) return -ENOMEM; - r = ethtool_connect(&ctx->ethtool_fd); - if (r < 0) { - link_config_ctx_free(ctx); - return r; - } - - r = sd_rtnl_open(0, &ctx->rtnl); - if (r < 0) { - link_config_ctx_free(ctx); - return r; - } - LIST_HEAD_INIT(ctx->links); - ctx->link_dirs = strv_new("/etc/net/links", - "/run/net/links", - "/usr/lib/net/links", - 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->ethtool_fd = -1; - 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; - } + ctx->enable_name_policy = true; *ret = ctx; + ctx = NULL; + + 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(&ctx->rtnl, 0); + if (r < 0) + return r; + return 0; } @@ -111,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); } @@ -125,8 +131,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); @@ -136,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) @@ -153,13 +160,17 @@ 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) { - 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); @@ -172,16 +183,40 @@ 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 (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); - /* update timestamps */ - paths_check_timestamp(ctx->link_dirs, ctx->link_dirs_ts_usec, true); + if (!enable_name_policy()) { + ctx->enable_name_policy = false; + log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring."); + } - r = conf_files_list_strv(&files, ".link", NULL, (const char **)ctx->link_dirs); + /* update timestamp */ + paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true); + + 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; @@ -197,135 +232,46 @@ 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 || !streq(match->match_mac, property)) { - log_debug("Device MAC address (%s) did not match MACAddress=%s", property, 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); - 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); - 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); - 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_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, + link->match_host, link->match_virt, link->match_kernel, + udev_device_get_sysattr_value(device, "address"), + udev_device_get_property_value(device, "ID_PATH"), + udev_device_get_driver(udev_device_get_parent(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; @@ -333,33 +279,32 @@ 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; } -static int get_mac(struct udev_device *device, bool want_random, struct ether_addr **ret) { - struct ether_addr *mac; - unsigned int seed; - int r, i; +#define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a) - mac = calloc(1, sizeof(struct ether_addr)); - if (!mac) - return -ENOMEM; +static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) { + 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"); @@ -368,78 +313,65 @@ 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; - /* combine the data */ - seed_str = strappenda(name, sd_id128_to_string(machine, machineid_buf)); + l = strlen(name); + sz = sizeof(sd_id128_t) + l; + v = alloca(sz); - /* hash to get seed */ - seed = string_hash_func(seed_str); - } + /* fetch some persistent data unique to this machine */ + r = sd_id128_get_machine((sd_id128_t*) v); + if (r < 0) + return r; + memcpy(v + sizeof(sd_id128_t), name, l); - 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 */ mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */ mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */ - *ret = mac; - return 0; } -int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) { - const char *name; - char *new_name = NULL; +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; - 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)); - else - log_info("Set link description of %s to '%s'", name, - config->description); - } + old_name = udev_device_get_sysname(device); + if (!old_name) + return -EINVAL; - 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, old_name, config->speed, config->duplex); + if (r < 0) + log_warning("Could not set speed or duplex of %s to %u Mbytes (%s): %s", + old_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, old_name, config->wol); + if (r < 0) + log_warning("Could not set WakeOnLan of %s to %s: %s", + old_name, wol_to_string(config->wol), strerror(-r)); ifindex = udev_device_get_ifindex(device); if (ifindex <= 0) { @@ -447,85 +379,84 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev return -ENODEV; } - if (config->name_policy && enable_name_policy()) { - char **policy; + if (ctx->enable_name_policy && config->name_policy) { + NamePolicy *policy; - STRV_FOREACH(policy, config->name_policy) { - if (streq(*policy, "onboard")) { - r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"), &new_name); - if (r < 0) - return r; - if (new_name) + for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) { + switch (*policy) { + case NAMEPOLICY_DATABASE: + new_name = udev_device_get_property_value(device, "ID_NET_NAME_FROM_DATABASE"); break; - } else if (streq(*policy, "slot")) { - r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_SLOT"), &new_name); - if (r < 0) - return r; - if (new_name) + case NAMEPOLICY_ONBOARD: + new_name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"); break; - } else if (streq(*policy, "path")) { - r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_PATH"), &new_name); - if (r < 0) - return r; - if (new_name) + case NAMEPOLICY_SLOT: + new_name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT"); break; - } else if (streq(*policy, "mac")) { - r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_MAC"), &new_name); - if (r < 0) - return r; - if (new_name) + case NAMEPOLICY_PATH: + new_name = udev_device_get_property_value(device, "ID_NET_NAME_PATH"); break; - } else - log_warning("Invalid link naming policy '%s', ignoring.", *policy); + 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 = calloc(1, IFNAMSIZ); - strscpy(new_name, IFNAMSIZ, 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; - if (config->mac_policy) { - if (streq(config->mac_policy, "persistent")) { + switch (config->mac_policy) { + case MACPOLICY_PERSISTENT: if (!mac_is_permanent(device)) { - r = get_mac(device, false, &mac); + r = get_mac(device, false, &generated_mac); if (r < 0) return r; + mac = &generated_mac; } - } else if (streq(config->mac_policy, "random")) { + break; + case MACPOLICY_RANDOM: if (!mac_is_random(device)) { - r = get_mac(device, true, &mac); + r = get_mac(device, true, &generated_mac); if (r < 0) return r; + mac = &generated_mac; } - } else - log_warning("Invalid MACAddress policy '%s', ignoring.", config->mac_policy); + break; + default: + mac = config->mac; } - if (!mac && config->mac) { - mac = calloc(1, sizeof(struct ether_addr)); - r = sscanf(config->mac, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", - &mac->ether_addr_octet[0], - &mac->ether_addr_octet[1], - &mac->ether_addr_octet[2], - &mac->ether_addr_octet[3], - &mac->ether_addr_octet[4], - &mac->ether_addr_octet[5]); - if (r != 6) { - r = -EINVAL; - goto out; - } - } - - r = rtnl_set_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu); + r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, config->mtu); if (r < 0) { - log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r)); - goto out; + log_warning("Could not set Alias, MACAddress or MTU on %s: %s", old_name, strerror(-r)); + return r; } return 0; -out: - free(new_name); - free(mac); - return r; } + +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_DATABASE] = "database", + [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");