diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index bf9f35b88c..6220a8d0b2 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -593,6 +593,7 @@ static const NLType rtnl_link_types[] = { [IFLA_MIN_MTU] = { .type = NETLINK_TYPE_U32 }, [IFLA_MAX_MTU] = { .type = NETLINK_TYPE_U32 }, [IFLA_PROP_LIST] = { .type = NETLINK_TYPE_NESTED, .type_system = &rtnl_prop_list_type_system }, + [IFLA_ALT_IFNAME] = { .type = NETLINK_TYPE_STRING, .size = ALTIFNAMSIZ - 1 }, }; static const NLTypeSystem rtnl_link_type_system = { diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c index bd9412a63b..80725f6cb4 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/sd-netlink/netlink-util.c @@ -123,6 +123,35 @@ int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const return 0; } +int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret) { + _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL; + int r; + + assert(rtnl); + assert(name); + assert(ret); + + if (!*rtnl) { + r = sd_netlink_open(rtnl); + if (r < 0) + return r; + } + + r = sd_rtnl_message_new_link(*rtnl, &message, RTM_GETLINK, 0); + if (r < 0) + return r; + + r = sd_netlink_message_append_string(message, IFLA_ALT_IFNAME, name); + if (r < 0) + return r; + + r = sd_netlink_call(*rtnl, message, 0, &reply); + if (r < 0) + return r; + + return sd_rtnl_message_link_get_ifindex(reply, ret); +} + int rtnl_message_new_synthetic_error(sd_netlink *rtnl, int error, uint32_t serial, sd_netlink_message **ret) { struct nlmsgerr *err; int r; diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h index 42c8917219..8c43fafec7 100644 --- a/src/libsystemd/sd-netlink/netlink-util.h +++ b/src/libsystemd/sd-netlink/netlink-util.h @@ -50,6 +50,7 @@ static inline bool rtnl_message_type_is_qdisc(uint16_t type) { int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name); int rtnl_set_link_properties(sd_netlink **rtnl, int ifindex, const char *alias, const struct ether_addr *mac, uint32_t mtu); int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names); +int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret); int rtnl_log_parse_error(int r); int rtnl_log_create_error(int r); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 4197c09186..9290a95e69 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -261,6 +261,7 @@ static int decode_netdev(sd_netlink_message *m, LinkInfo *info) { } static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) { + _cleanup_strv_free_ char **altnames = NULL; const char *name; int ifindex, r; uint16_t type; @@ -283,13 +284,26 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) { if (r < 0) return r; + r = sd_netlink_message_read_strv(m, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &altnames); + if (r < 0 && !IN_SET(r, -EOPNOTSUPP, -ENODATA)) + return r; + if (patterns) { char str[DECIMAL_STR_MAX(int)]; xsprintf(str, "%i", ifindex); + if (!strv_fnmatch(patterns, str, 0) && !strv_fnmatch(patterns, name, 0)) { + bool match = false; + char **p; - if (!strv_fnmatch(patterns, str, 0) && !strv_fnmatch(patterns, name, 0)) - return 0; + STRV_FOREACH(p, altnames) + if (strv_fnmatch(patterns, *p, 0)) { + match = true; + break; + } + if (!match) + return 0; + } } r = sd_rtnl_message_link_get_type(m, &info->iftype); @@ -298,6 +312,7 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) { strscpy(info->name, sizeof info->name, name); info->ifindex = ifindex; + info->alternative_names = TAKE_PTR(altnames); info->has_mac_address = sd_netlink_message_read_ether_addr(m, IFLA_ADDRESS, &info->mac_address) >= 0 && @@ -306,7 +321,6 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns) { (void) sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu); (void) sd_netlink_message_read_u32(m, IFLA_MIN_MTU, &info->min_mtu); (void) sd_netlink_message_read_u32(m, IFLA_MAX_MTU, &info->max_mtu); - (void) sd_netlink_message_read_strv(m, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &info->alternative_names); info->has_rx_queues = sd_netlink_message_read_u32(m, IFLA_NUM_RX_QUEUES, &info->rx_queues) >= 0 && @@ -1764,8 +1778,11 @@ static int link_delete(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { r = parse_ifindex_or_ifname(argv[i], &index); - if (r < 0) - return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + if (r < 0) { + r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index); + if (r < 0) + return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + } r = set_put(indexes, INT_TO_PTR(index)); if (r < 0) @@ -1808,6 +1825,7 @@ static int link_renew_one(sd_bus *bus, int index, const char *name) { static int link_renew(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; int index, i, k = 0, r; r = sd_bus_open_system(&bus); @@ -1816,8 +1834,11 @@ static int link_renew(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { r = parse_ifindex_or_ifname(argv[i], &index); - if (r < 0) - return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + if (r < 0) { + r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index); + if (r < 0) + return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + } r = link_renew_one(bus, index, argv[i]); if (r < 0 && k >= 0) @@ -1852,6 +1873,7 @@ static int verb_reload(int argc, char *argv[], void *userdata) { static int verb_reconfigure(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; _cleanup_set_free_ Set *indexes = NULL; int index, i, r; Iterator j; @@ -1867,8 +1889,11 @@ static int verb_reconfigure(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { r = parse_ifindex_or_ifname(argv[i], &index); - if (r < 0) - return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + if (r < 0) { + r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index); + if (r < 0) + return log_error_errno(r, "Failed to resolve interface %s", argv[i]); + } r = set_put(indexes, INT_TO_PTR(index)); if (r < 0) diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c index 773dcf0b4d..8bcce06b85 100644 --- a/src/network/networkd-manager-bus.c +++ b/src/network/networkd-manager-bus.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" +#include "netlink-util.h" #include "networkd-link-bus.h" #include "networkd-link.h" #include "networkd-manager-bus.h" @@ -66,8 +67,11 @@ static int method_get_link_by_name(sd_bus_message *message, void *userdata, sd_b return r; index = if_nametoindex(name); - if (index <= 0) - return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s not known", name); + if (index <= 0) { + r = rtnl_resolve_link_alternative_name(&manager->rtnl, name, &index); + if (r < 0) + return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s not known", name); + } link = hashmap_get(manager->links, INT_TO_PTR(index)); if (!link) diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 19cecf1895..ad97a89447 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -503,6 +503,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, strv_remove(altnames, new_name); strv_remove(altnames, old_name); strv_uniq(altnames); + strv_sort(altnames); r = rtnl_set_link_alternative_names(&ctx->rtnl, ifindex, altnames); if (r == -EOPNOTSUPP)