79 lines
3.3 KiB
Diff
79 lines
3.3 KiB
Diff
|
From 8db22aec9bfd140855b64f2879b7ca6d1cba69c6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Tue, 17 Dec 2019 18:28:36 +0900
|
||
|
|
Subject: [PATCH] sd-netlink: introduce rtnl_resolve_link_alternative_names()
|
||
|
|
|
||
|
|
(cherry picked from commit b04c5e51da7a61d41d564e73a1e92bd8b29b0223)
|
||
|
|
|
||
|
|
Related: #1850986
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-netlink/netlink-types.c | 1 +
|
||
|
|
src/libsystemd/sd-netlink/netlink-util.c | 29 +++++++++++++++++++++++
|
||
|
|
src/libsystemd/sd-netlink/netlink-util.h | 1 +
|
||
|
|
3 files changed, 31 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
|
||
|
|
index 47d9c7f1c4..e118a0aa30 100644
|
||
|
|
--- a/src/libsystemd/sd-netlink/netlink-types.c
|
||
|
|
+++ b/src/libsystemd/sd-netlink/netlink-types.c
|
||
|
|
@@ -511,6 +511,7 @@ static const NLType rtnl_link_types[] = {
|
||
|
|
[IFLA_PHYS_PORT_ID] = { .type = NETLINK_TYPE_BINARY, .len = MAX_PHYS_PORT_ID_LEN },
|
||
|
|
*/
|
||
|
|
[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 c1c306f121..62fc71a3d8 100644
|
||
|
|
--- a/src/libsystemd/sd-netlink/netlink-util.c
|
||
|
|
+++ b/src/libsystemd/sd-netlink/netlink-util.c
|
||
|
|
@@ -120,6 +120,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 92de19c092..ea98439fad 100644
|
||
|
|
--- a/src/libsystemd/sd-netlink/netlink-util.h
|
||
|
|
+++ b/src/libsystemd/sd-netlink/netlink-util.h
|
||
|
|
@@ -39,6 +39,7 @@ static inline bool rtnl_message_type_is_routing_policy_rule(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);
|