#include "fileio.h"
#include "hashmap.h"
#include "rtnl-util.h"
+#include "net-util.h"
struct link_config_ctx {
LIST_HEAD(link_config, links);
int ethtool_fd;
+ bool enable_name_policy;
+
sd_rtnl *rtnl;
char **link_dirs;
ctx->ethtool_fd = -1;
+ ctx->enable_name_policy = true;
+
ctx->link_dirs = strv_new("/etc/systemd/network",
"/run/systemd/network",
"/usr/lib/systemd/network",
+#ifdef HAVE_SPLIT_USR
+ "/lib/systemd/network",
+#endif
NULL);
if (!ctx->link_dirs) {
log_error("failed to build link config directory array");
free(link->match_driver);
free(link->match_type);
free(link->description);
+ free(link->alias);
free(link);
}
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);
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 (l == sizeof("net.ifnames=0") - 1 && 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);
+ 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);
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;
-}
-
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,
+ udev_device_get_sysattr_value(device, "address"),
+ udev_device_get_property_value(device, "ID_PATH"),
+ udev_device_get_driver(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 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 */
- }
+ *ret = NULL;
- 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) {
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, 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));
+ old_name, config->speed, 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++) {
}
}
- 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:
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;
}
+
+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_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