X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=dc218eb79cb31ab4c21fb883c2f75d819252d893;hb=baade8cc237c37bd8905d86ec6e9c7872d4abe03;hp=4ff20e6d10d4048fb0113d6b2f07c18d8fb4c435;hpb=68ba38770640413b4fa06773447666eb88a38d4c;p=elogind.git diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 4ff20e6d1..dc218eb79 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -88,30 +88,6 @@ 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 == -1) { - r = ethtool_connect(&ctx->ethtool_fd); - if (r < 0) { - log_warning("link_config: could not connect to ethtool: %s", - strerror(-r)); - 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; -} - static void link_configs_free(link_config_ctx *ctx) { link_config *link, *link_next; @@ -120,6 +96,7 @@ static void link_configs_free(link_config_ctx *ctx) { LIST_FOREACH_SAFE(links, link, link_next, ctx->links) { free(link->filename); + free(link->name); free(link->match_path); free(link->match_driver); free(link->match_type); @@ -199,11 +176,10 @@ static bool enable_name_policy(void) { size_t l; r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", - strerror(-r)); - if (r <= 0) + if (r < 0) { + log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m"); return true; + } FOREACH_WORD_QUOTED(word, l, line, state) if (strneq(word, "net.ifnames=0", l)) @@ -221,17 +197,15 @@ int link_config_load(link_config_ctx *ctx) { if (!enable_name_policy()) { ctx->enable_name_policy = false; - log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring."); + log_info("Network interface NamePolicy= disabled on kernel command line, ignoring."); } /* 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; - } + if (r < 0) + return log_error_errno(r, "failed to enumerate link files: %m"); STRV_FOREACH_BACKWARDS(f, files) { r = load_link(ctx, *f); @@ -251,16 +225,25 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config *link; LIST_FOREACH(links, link, ctx->links) { + const char* attr_value; + unsigned char name_assign_type = NET_NAME_UNKNOWN; + + attr_value = udev_device_get_sysattr_value(device, "name_assign_type"); + if (attr_value) + (void)safe_atou8(attr_value, &name_assign_type); + + attr_value = 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_type, link->match_name, link->match_host, link->match_virt, link->match_kernel, link->match_arch, - ether_aton(udev_device_get_sysattr_value(device, "address")), + attr_value ? ether_aton(attr_value) : NULL, udev_device_get_property_value(device, "ID_PATH"), udev_device_get_driver(udev_device_get_parent(device)), udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), - NULL)) { + udev_device_get_sysname(device), + name_assign_type == NET_NAME_RENAMED)) { log_debug("Config file %s applies to device %s", link->filename, udev_device_get_sysname(device)); @@ -279,9 +262,11 @@ static bool mac_is_random(struct udev_device *device) { unsigned type; int r; + /* if we can't get the assign type, assume it is not random */ s = udev_device_get_sysattr_value(device, "addr_assign_type"); if (!s) - return false; /* if we don't know, assume it is not random */ + return false; + r = safe_atou(s, &type); if (r < 0) return false; @@ -294,9 +279,11 @@ static bool should_rename(struct udev_device *device, bool respect_predictable) unsigned type; int r; + /* if we can't get the assgin type, assume we should rename */ s = udev_device_get_sysattr_value(device, "name_assign_type"); if (!s) - return true; /* if we don't know, assume we should rename */ + return true; + r = safe_atou(s, &type); if (r < 0) return true; @@ -304,14 +291,17 @@ static bool should_rename(struct udev_device *device, bool respect_predictable) switch (type) { case NET_NAME_USER: case NET_NAME_RENAMED: - return false; /* these were already named by userspace, do not touch again */ + /* these were already named by userspace, do not touch again */ + return false; case NET_NAME_PREDICTABLE: + /* the kernel claims to have given a predictable name */ if (respect_predictable) - return false; /* the kernel claims to have given a predictable name */ + return false; /* fall through */ case NET_NAME_ENUM: default: - return true; /* the name is known to be bad, or of an unknown type */ + /* the name is known to be bad, or of an unknown type */ + return true; } } @@ -333,8 +323,8 @@ static int get_mac(struct udev_device *device, bool want_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) */ + mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */ + mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */ return 0; } @@ -353,25 +343,21 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, assert(device); assert(name); - r = link_config_ctx_connect(ctx); - if (r < 0) - return r; - old_name = udev_device_get_sysname(device); if (!old_name) return -EINVAL; - r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed / 1024, + 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 Mbps (%s): %s", - old_name, config->speed / 1024, - duplex_to_string(config->duplex), strerror(-r)); + log_warning_errno(r, "Could not set speed or duplex of %s to %u Mbps (%s): %m", + old_name, config->speed / 1024, + duplex_to_string(config->duplex)); - r = ethtool_set_wol(ctx->ethtool_fd, old_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)); + log_warning_errno(r, "Could not set WakeOnLan of %s to %s: %m", + old_name, wol_to_string(config->wol)); ifindex = udev_device_get_ifindex(device); if (ifindex <= 0) { @@ -410,14 +396,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, } if (should_rename(device, respect_predictable)) { + /* if not set by policy, fall back manually set name */ if (!new_name) - /* if not set by policy, fall back manually set name */ new_name = config->name; } else new_name = NULL; - *name = new_name; - switch (config->mac_policy) { case MACPOLICY_PERSISTENT: if (mac_is_random(device)) { @@ -443,13 +427,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, + r = rtnl_set_link_properties(&ctx->rtnl, ifindex, config->alias, mac, config->mtu); - if (r < 0) { - log_warning("Could not set Alias, MACAddress or MTU on %s: %s", - old_name, strerror(-r)); - return r; - } + if (r < 0) + return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name); + + *name = new_name; return 0; } @@ -459,15 +442,11 @@ int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret 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); + r = ethtool_get_driver(&ctx->ethtool_fd, name, &driver); if (r < 0) return r;