sd_rtnl *rtnl;
char **link_dirs;
- usec_t *link_dirs_ts_usec;
+ usec_t link_dirs_ts_usec;
};
+DEFINE_TRIVIAL_CLEANUP_FUNC(link_config_ctx*, link_config_ctx_free);
+#define _cleanup_link_config_ctx_free_ _cleanup_(link_config_ctx_freep)
+
int link_config_ctx_new(link_config_ctx **ret) {
- link_config_ctx *ctx;
- int r;
+ _cleanup_link_config_ctx_free_ link_config_ctx *ctx = NULL;
if (!ret)
return -EINVAL;
if (!ctx)
return -ENOMEM;
- r = ethtool_connect(&ctx->ethtool_fd);
- if (r < 0) {
- link_config_ctx_free(ctx);
- return r;
- }
-
- r = sd_rtnl_open(0, &ctx->rtnl);
- if (r < 0) {
- link_config_ctx_free(ctx);
- return r;
- }
-
LIST_HEAD_INIT(ctx->links);
- ctx->link_dirs = strv_new("/etc/net/links",
- "/run/net/links",
- "/usr/lib/net/links",
+ 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");
- link_config_ctx_free(ctx);
return -ENOMEM;
}
+
if (!path_strv_canonicalize_uniq(ctx->link_dirs)) {
log_error("failed to canonicalize link config directories\n");
- link_config_ctx_free(ctx);
- return -ENOMEM;
- }
-
- ctx->link_dirs_ts_usec = calloc(strv_length(ctx->link_dirs), sizeof(usec_t));
- if(!ctx->link_dirs_ts_usec) {
- link_config_ctx_free(ctx);
return -ENOMEM;
}
*ret = ctx;
+ ctx = NULL;
+
+ return 0;
+}
+
+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;
+
+ r = sd_rtnl_open(0, &ctx->rtnl);
+ if (r < 0)
+ return r;
+
return 0;
}
sd_rtnl_unref(ctx->rtnl);
strv_free(ctx->link_dirs);
- free(ctx->link_dirs_ts_usec);
link_configs_free(ctx);
free(ctx);
goto failure;
}
+ 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) {
link_configs_free(ctx);
- /* update timestamps */
- paths_check_timestamp(ctx->link_dirs, ctx->link_dirs_ts_usec, true);
+ /* update timestamp */
+ paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, true);
r = conf_files_list_strv(&files, ".link", NULL, (const char **)ctx->link_dirs);
if (r < 0) {
}
bool link_config_should_reload(link_config_ctx *ctx) {
- return paths_check_timestamp(ctx->link_dirs, ctx->link_dirs_ts_usec, false);
+ return paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, false);
}
static bool match_config(link_config *match, struct udev_device *device) {
if (match->match_mac) {
property = udev_device_get_sysattr_value(device, "address");
- if (!property || !streq(match->match_mac, property)) {
- log_debug("Device MAC address (%s) did not match MACAddress=%s", property, match->match_mac);
+ 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 (!property || !streq(match->match_path, property)) {
- log_debug("Device's persistent path (%s) did not match Path=%s", property, match->match_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 (!property || !streq(match->match_driver, property)) {
- log_debug("Device driver (%s) did not match Driver=%s", property, match->match_driver);
+ 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 (!property || !streq(match->match_type, property)) {
- log_debug("Device type (%s) did not match Type=%s", property, match->match_type);
+ if (!streq_ptr(match->match_type, property)) {
+ log_debug("Device type (%s) did not match Type=%s",
+ property, match->match_type);
return 0;
}
}
}
if (need_update) {
- r = sd_rtnl_send_with_reply_and_block(rtnl, message, 5 * USEC_PER_SEC, NULL);
+ r = sd_rtnl_send_with_reply_and_block(rtnl, message, 0, NULL);
if (r < 0)
return r;
}
static bool mac_is_random(struct udev_device *device) {
const char *s;
- int type;
+ unsigned type;
+ int r;
s = udev_device_get_sysattr_value(device, "addr_assign_type");
if (!s)
- return -EINVAL;
- type = strtoul(s, NULL, 0);
+ return false; /* if we don't know, assume it is not random */
+ r = safe_atou(s, &type);
+ if (r < 0)
+ return false;
/* check for NET_ADDR_RANDOM */
return type == 1;
static bool mac_is_permanent(struct udev_device *device) {
const char *s;
- int type;
+ unsigned type;
+ int r;
s = udev_device_get_sysattr_value(device, "addr_assign_type");
if (!s)
- return -EINVAL;
- type = strtoul(s, NULL, 0);
+ 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 **ret) {
- struct ether_addr *mac;
+static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) {
unsigned int seed;
int r, i;
- mac = calloc(1, sizeof(struct ether_addr));
- if (!mac)
- return -ENOMEM;
-
if (want_random)
seed = random_u();
else {
if (!name) {
name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
if (!name)
- return -1;
+ return -ENOENT;
}
}
/* fetch some persistent data unique to this machine */
r = sd_id128_get_machine(&machine);
if (r < 0)
- return -1;
+ return r;
/* combine the data */
seed_str = strappenda(name, sd_id128_to_string(machine, machineid_buf));
mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */
mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */
- *ret = mac;
-
return 0;
}
int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) {
const char *name;
- char *new_name = NULL;
+ const char *new_name = NULL;
+ struct ether_addr generated_mac;
struct ether_addr *mac = NULL;
int r, ifindex;
+ r = link_config_ctx_connect(ctx);
+ if (r < 0)
+ return r;
+
name = udev_device_get_sysname(device);
if (!name)
return -EINVAL;
if (r < 0)
log_warning("Could not set description of %s to '%s': %s",
name, config->description, strerror(-r));
- else
- log_info("Set link description of %s to '%s'", name,
- config->description);
}
- if (config->speed || config->duplex) {
- r = ethtool_set_speed(ctx->ethtool_fd, 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, config->duplex, strerror(-r));
- else
- log_info("Set speed or duplex of %s to %u Mbytes (%s)", name,
- config->speed, config->duplex);
- }
+ r = ethtool_set_speed(ctx->ethtool_fd, 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));
- if (config->wol) {
- r = ethtool_set_wol(ctx->ethtool_fd, name, config->wol);
- if (r < 0)
- log_warning("Could not set WakeOnLan of %s to %s: %s",
- name, config->wol, strerror(-r));
- else
- log_info("Set WakeOnLan of %s to %s", name, config->wol);
- }
+ r = ethtool_set_wol(ctx->ethtool_fd, 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));
ifindex = udev_device_get_ifindex(device);
if (ifindex <= 0) {
}
if (config->name_policy && enable_name_policy()) {
- char **policy;
+ NamePolicy *policy;
- STRV_FOREACH(policy, config->name_policy) {
- if (streq(*policy, "onboard")) {
- r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD"), &new_name);
- if (r < 0)
- return r;
- if (new_name)
+ for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) {
+ switch (*policy) {
+ case NAMEPOLICY_ONBOARD:
+ new_name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD");
break;
- } else if (streq(*policy, "slot")) {
- r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_SLOT"), &new_name);
- if (r < 0)
- return r;
- if (new_name)
+ case NAMEPOLICY_SLOT:
+ new_name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT");
break;
- } else if (streq(*policy, "path")) {
- r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_PATH"), &new_name);
- if (r < 0)
- return r;
- if (new_name)
+ case NAMEPOLICY_PATH:
+ new_name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
break;
- } else if (streq(*policy, "mac")) {
- r = strdup_or_null(udev_device_get_property_value(device, "ID_NET_NAME_MAC"), &new_name);
- if (r < 0)
- return r;
- if (new_name)
+ case NAMEPOLICY_MAC:
+ new_name = udev_device_get_property_value(device, "ID_NET_NAME_MAC");
+ break;
+ default:
break;
- } else
- log_warning("Invalid link naming policy '%s', ignoring.", *policy);
+ }
}
}
if (!new_name && config->name) {
- new_name = calloc(1, IFNAMSIZ);
- strscpy(new_name, IFNAMSIZ, config->name);
+ new_name = config->name;
}
- if (config->mac_policy) {
- if (streq(config->mac_policy, "persistent")) {
+ switch (config->mac_policy) {
+ case MACPOLICY_PERSISTENT:
if (!mac_is_permanent(device)) {
- r = get_mac(device, false, &mac);
+ r = get_mac(device, false, &generated_mac);
if (r < 0)
return r;
+ mac = &generated_mac;
}
- } else if (streq(config->mac_policy, "random")) {
+ break;
+ case MACPOLICY_RANDOM:
if (!mac_is_random(device)) {
- r = get_mac(device, true, &mac);
+ r = get_mac(device, true, &generated_mac);
if (r < 0)
return r;
+ mac = &generated_mac;
}
- } else
- log_warning("Invalid MACAddress policy '%s', ignoring.", config->mac_policy);
- }
-
- if (!mac && config->mac) {
- mac = calloc(1, sizeof(struct ether_addr));
- r = sscanf(config->mac, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
- &mac->ether_addr_octet[0],
- &mac->ether_addr_octet[1],
- &mac->ether_addr_octet[2],
- &mac->ether_addr_octet[3],
- &mac->ether_addr_octet[4],
- &mac->ether_addr_octet[5]);
- if (r != 6) {
- r = -EINVAL;
- goto out;
- }
+ break;
+ default:
+ mac = config->mac;
}
r = rtnl_set_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu);
if (r < 0) {
log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r));
- goto out;
+ return r;
}
return 0;
-out:
- free(new_name);
- free(mac);
- return r;
}
~ianmdlvl / elogind.git / blobdiff