#include "fileio.h"
#include "hashmap.h"
#include "rtnl-util.h"
+#include "network-internal.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;
};
+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)
ctx->ethtool_fd = -1;
- 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;
- }
+ ctx->enable_name_policy = true;
*ret = ctx;
ctx = NULL;
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;
}
free(link->match_driver);
free(link->match_type);
free(link->description);
+ free(link->alias);
+ free(link->name_policy);
free(link);
}
if (!ctx)
return;
- if (ctx->ethtool_fd >= 0)
- close_nointr_nofail(ctx->ethtool_fd);
+ safe_close(ctx->ethtool_fd);
sd_rtnl_unref(ctx->rtnl);
- strv_free(ctx->link_dirs);
link_configs_free(ctx);
free(ctx);
}
static int load_link(link_config_ctx *ctx, const char *filename) {
- link_config *link;
- 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);
if (r < 0) {
- log_warning("Colud not parse config file %s: %s", filename, strerror(-r));
- goto failure;
+ log_warning("Could not parse config file %s: %s", filename, strerror(-r));
+ return r;
} else
- log_info("Parsed configuration file %s", filename);
+ log_debug("Parsed configuration file %s", filename);
link->filename = strdup(filename);
LIST_PREPEND(links, ctx->links, link);
+ link = NULL;
return 0;
+}
+
+static bool enable_name_policy(void) {
+ _cleanup_free_ char *line = NULL;
+ char *w, *state;
+ int r;
+ size_t l;
-failure:
- free(link);
- return r;
+ 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;
+ _cleanup_strv_free_ char **files;
+ char **f;
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;
}
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_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, link->match_arch,
+ ether_aton(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_property_value(device, "ID_NET_DRIVER"),
+ 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 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;
+ *ret = NULL;
- return true;
+ return -ENOENT;
}
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;
-}
-
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;
-
- /* 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;
- }
- }
- /* fetch some persistent data unique to this machine */
- r = sd_id128_get_machine(&machine);
+ uint8_t result[8];
+
+ r = net_get_unique_predictable_data(device, result);
if (r < 0)
return r;
- /* 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);
-
- 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 */
return 0;
}
-int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) {
- const char *name;
+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;
+ assert(ctx);
+ assert(config);
+ assert(device);
+ assert(name);
+
r = link_config_ctx_connect(ctx);
if (r < 0)
return r;
- name = udev_device_get_sysname(device);
- if (!name)
+ old_name = udev_device_get_sysname(device);
+ if (!old_name)
return -EINVAL;
- log_info("Configuring %s", name);
-
- 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));
- }
-
- r = ethtool_set_speed(ctx->ethtool_fd, 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",
- 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, 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",
- name, wol_to_string(config->wol), strerror(-r));
+ old_name, wol_to_string(config->wol), strerror(-r));
ifindex = udev_device_get_ifindex(device);
if (ifindex <= 0) {
return -ENODEV;
}
- if (config->name_policy && enable_name_policy()) {
+ if (ctx->enable_name_policy && config->name_policy) {
NamePolicy *policy;
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;
}
}
- if (!new_name && config->name) {
- new_name = 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;
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)
return r;
mac = config->mac;
}
- r = rtnl_set_link_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));
+ log_warning("Could not set Alias, MACAddress or MTU on %s: %s", old_name, strerror(-r));
return r;
}
return 0;
}
+
+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"
+};
+
+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_MAX] = {
+ [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");
~ianmdlvl / elogind.git / blobdiff