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=fe916a4326755e7fc0be49d2c89d77db6e831533;hp=bd97cd8cf87d2672db439141aea1a440b22d2e00;hb=e9f3d2d508bfd9fb5b54e82994bda365a71eb864;hpb=2ad8416dd057e7e3185169609ca3006e7649f576 diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index bd97cd8cf..fe916a432 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -38,7 +38,7 @@ #include "fileio.h" #include "hashmap.h" #include "rtnl-util.h" -#include "net-util.h" +#include "network-internal.h" #include "siphash24.h" struct link_config_ctx { @@ -90,16 +90,23 @@ int link_config_ctx_new(link_config_ctx **ret) { 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; + if (ctx->ethtool_fd == -1) { + r = ethtool_connect(&ctx->ethtool_fd); + if (r < 0) { + log_warning("link_config: could not connect to ethtool: %s", + strerror(-r)); + return r; + } + } - r = sd_rtnl_open(0, &ctx->rtnl); - if (r < 0) - return r; + if (!ctx->rtnl) { + r = sd_rtnl_open(&ctx->rtnl, 0); + if (r < 0) { + log_warning("link_config: could not connect to rtnl: %s", + strerror(-r)); + return r; + } + } return 0; } @@ -117,6 +124,7 @@ static void link_configs_free(link_config_ctx *ctx) { free(link->match_type); free(link->description); free(link->alias); + free(link->name_policy); free(link); } @@ -126,8 +134,7 @@ void link_config_ctx_free(link_config_ctx *ctx) { if (!ctx) return; - if (ctx->ethtool_fd >= 0) - close_nointr_nofail(ctx->ethtool_fd); + safe_close(ctx->ethtool_fd); sd_rtnl_unref(ctx->rtnl); @@ -139,52 +146,54 @@ void link_config_ctx_free(link_config_ctx *ctx) { } static int load_link(link_config_ctx *ctx, const char *filename) { - link_config *link; - _cleanup_fclose_ FILE *file; + _cleanup_free_ link_config *link = NULL; + _cleanup_fclose_ FILE *file = NULL; int r; assert(ctx); assert(filename); + if (null_or_empty_path(filename)) { + log_debug("skipping empty file: %s", filename); + return 0; + } + file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) return 0; else - return errno; + return -errno; } link = new0(link_config, 1); - if (!link) { - r = log_oom(); - goto failure; - } + if (!link) + return log_oom(); 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); + r = config_parse(NULL, filename, file, + "Match\0Link\0Ethernet\0", + config_item_perf_lookup, link_config_gperf_lookup, + false, false, link); if (r < 0) { log_warning("Could not parse config file %s: %s", filename, strerror(-r)); - goto failure; + return r; } else log_debug("Parsed configuration file %s", filename); link->filename = strdup(filename); LIST_PREPEND(links, ctx->links, link); + link = NULL; return 0; - -failure: - free(link); - return r; } static bool enable_name_policy(void) { - _cleanup_free_ char *line; + _cleanup_free_ char *line = NULL; char *w, *state; int r; size_t l; @@ -204,7 +213,8 @@ static bool enable_name_policy(void) { int link_config_load(link_config_ctx *ctx) { int r; - char **files, **f; + _cleanup_strv_free_ char **files; + char **f; link_configs_free(ctx); @@ -240,11 +250,13 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi LIST_FOREACH(links, link, ctx->links) { - if (net_match_config(link->match_mac, link->match_path, - link->match_driver, link->match_type, NULL, - udev_device_get_sysattr_value(device, "address"), + 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, link->match_arch, + ether_aton(udev_device_get_sysattr_value(device, "address")), udev_device_get_property_value(device, "ID_PATH"), - udev_device_get_driver(device), + udev_device_get_driver(udev_device_get_parent(device)), + udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), NULL)) { log_debug("Config file %s applies to device %s", @@ -276,60 +288,17 @@ static bool mac_is_random(struct udev_device *device) { return type == 1; } -static bool mac_is_permanent(struct udev_device *device) { - const char *s; - unsigned type; - int r; - - s = udev_device_get_sysattr_value(device, "addr_assign_type"); - if (!s) - 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; -} - -#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) { int r; if (want_random) random_bytes(mac->ether_addr_octet, ETH_ALEN); else { - const char *name; 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"); - 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 -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((sd_id128_t*) v); + r = net_get_unique_predictable_data(device, result); if (r < 0) return r; - memcpy(v + sizeof(sd_id128_t), name, l); - - /* 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); assert_cc(ETH_ALEN <= sizeof(result)); memcpy(mac->ether_addr_octet, result, ETH_ALEN); @@ -362,10 +331,11 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev if (!old_name) return -EINVAL; - r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed, config->duplex); + r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed / 1024, 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)); + log_warning("Could not set speed or duplex of %s to %u Mbps (%s): %s", + old_name, config->speed / 1024, duplex_to_string(config->duplex), + strerror(-r)); r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol); if (r < 0) @@ -383,6 +353,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev 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; case NAMEPOLICY_ONBOARD: new_name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"); break; @@ -410,9 +383,11 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev switch (config->mac_policy) { case MACPOLICY_PERSISTENT: - if (!mac_is_permanent(device)) { + if (mac_is_random(device)) { r = get_mac(device, false, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -420,7 +395,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev case MACPOLICY_RANDOM: if (!mac_is_random(device)) { r = get_mac(device, true, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -438,7 +415,28 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev return 0; } -static const char* const mac_policy_table[] = { +int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret) { + const char *name; + char *driver; + int r; + + r = link_config_ctx_connect(ctx); + if (r < 0) + return r; + + name = udev_device_get_sysname(device); + if (!name) + return -EINVAL; + + r = ethtool_get_driver(ctx->ethtool_fd, name, &driver); + if (r < 0) + return r; + + *ret = driver; + return 0; +} + +static const char* const mac_policy_table[_MACPOLICY_MAX] = { [MACPOLICY_PERSISTENT] = "persistent", [MACPOLICY_RANDOM] = "random" }; @@ -446,7 +444,8 @@ static const char* const mac_policy_table[] = { 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[] = { +static const char* const name_policy_table[_NAMEPOLICY_MAX] = { + [NAMEPOLICY_DATABASE] = "database", [NAMEPOLICY_ONBOARD] = "onboard", [NAMEPOLICY_SLOT] = "slot", [NAMEPOLICY_PATH] = "path",