***/
#include <netinet/ether.h>
-#include <linux/netdevice.h>
#include "sd-id128.h"
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;
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))
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 */
r = conf_files_list_strv(&files, ".link", NULL, link_dirs);
if (r < 0) {
- log_error("failed to enumerate link files: %s", strerror(-r));
+ log_error_errno(r, "failed to enumerate link files: %m");
return r;
}
link_config *link;
LIST_FOREACH(links, link, ctx->links) {
+ const char* 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_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"),
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;
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;
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;
}
}
}
/* 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;
}
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));
- 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));
if (ctx->enable_name_policy && config->name_policy) {
NamePolicy *policy;
- for (policy = config->name_policy; !respect_predictable && !new_name &&
- *policy != _NAMEPOLICY_INVALID; policy++) {
+ for (policy = config->name_policy;
+ !new_name && *policy != _NAMEPOLICY_INVALID; policy++) {
switch (*policy) {
case NAMEPOLICY_KERNEL:
respect_predictable = true;
}
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)) {
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",
return r;
}
+ *name = new_name;
+
return 0;
}
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;
~ianmdlvl / elogind.git / blobdiff