|
 |
da2bf9 |
From c6b2c2fb577d20879b5b4c610c4c29bac259beab Mon Sep 17 00:00:00 2001
|
|
|
da2bf9 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
da2bf9 |
Date: Fri, 17 Jul 2020 21:29:13 +0900
|
|
|
da2bf9 |
Subject: [PATCH] netlink: introduce rtnl_get/delete_link_alternative_names()
|
|
|
da2bf9 |
|
|
|
da2bf9 |
(cherry picked from commit 14982526145de84201c7e3b4fc6be6aa5e9a08f7)
|
|
|
da2bf9 |
|
|
|
da2bf9 |
Related: #2005008
|
|
|
da2bf9 |
---
|
|
|
da2bf9 |
src/libsystemd/sd-netlink/netlink-util.c | 45 ++++++++++++++++++++++--
|
|
|
da2bf9 |
src/libsystemd/sd-netlink/netlink-util.h | 2 ++
|
|
|
da2bf9 |
2 files changed, 45 insertions(+), 2 deletions(-)
|
|
|
da2bf9 |
|
|
|
da2bf9 |
diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c
|
|
|
da2bf9 |
index 62fc71a3d8..7f09261981 100644
|
|
|
da2bf9 |
--- a/src/libsystemd/sd-netlink/netlink-util.c
|
|
|
da2bf9 |
+++ b/src/libsystemd/sd-netlink/netlink-util.c
|
|
|
da2bf9 |
@@ -81,12 +81,45 @@ int rtnl_set_link_properties(sd_netlink **rtnl, int ifindex, const char *alias,
|
|
|
da2bf9 |
return 0;
|
|
|
da2bf9 |
}
|
|
|
da2bf9 |
|
|
|
da2bf9 |
-int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names) {
|
|
|
da2bf9 |
+int rtnl_get_link_alternative_names(sd_netlink **rtnl, int ifindex, char ***ret) {
|
|
|
da2bf9 |
+ _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL;
|
|
|
da2bf9 |
+ _cleanup_strv_free_ char **names = NULL;
|
|
|
da2bf9 |
+ int r;
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ assert(rtnl);
|
|
|
da2bf9 |
+ assert(ifindex > 0);
|
|
|
da2bf9 |
+ assert(ret);
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ if (!*rtnl) {
|
|
|
da2bf9 |
+ r = sd_netlink_open(rtnl);
|
|
|
da2bf9 |
+ if (r < 0)
|
|
|
da2bf9 |
+ return r;
|
|
|
da2bf9 |
+ }
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ r = sd_rtnl_message_new_link(*rtnl, &message, RTM_GETLINK, ifindex);
|
|
|
da2bf9 |
+ if (r < 0)
|
|
|
da2bf9 |
+ return r;
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ r = sd_netlink_call(*rtnl, message, 0, &reply);
|
|
|
da2bf9 |
+ if (r < 0)
|
|
|
da2bf9 |
+ return r;
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ r = sd_netlink_message_read_strv(reply, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &names);
|
|
|
da2bf9 |
+ if (r < 0 && r != -ENODATA)
|
|
|
da2bf9 |
+ return r;
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ *ret = TAKE_PTR(names);
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+ return 0;
|
|
|
da2bf9 |
+}
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+static int rtnl_update_link_alternative_names(sd_netlink **rtnl, uint16_t nlmsg_type, int ifindex, char * const *alternative_names) {
|
|
|
da2bf9 |
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL;
|
|
|
da2bf9 |
int r;
|
|
|
da2bf9 |
|
|
|
da2bf9 |
assert(rtnl);
|
|
|
da2bf9 |
assert(ifindex > 0);
|
|
|
da2bf9 |
+ assert(IN_SET(nlmsg_type, RTM_NEWLINKPROP, RTM_DELLINKPROP));
|
|
|
da2bf9 |
|
|
|
da2bf9 |
if (strv_isempty(alternative_names))
|
|
|
da2bf9 |
return 0;
|
|
|
da2bf9 |
@@ -97,7 +130,7 @@ int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const
|
|
|
da2bf9 |
return r;
|
|
|
da2bf9 |
}
|
|
|
da2bf9 |
|
|
|
da2bf9 |
- r = sd_rtnl_message_new_link(*rtnl, &message, RTM_NEWLINKPROP, ifindex);
|
|
|
da2bf9 |
+ r = sd_rtnl_message_new_link(*rtnl, &message, nlmsg_type, ifindex);
|
|
|
da2bf9 |
if (r < 0)
|
|
|
da2bf9 |
return r;
|
|
|
da2bf9 |
|
|
|
da2bf9 |
@@ -120,6 +153,14 @@ int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const
|
|
|
da2bf9 |
return 0;
|
|
|
da2bf9 |
}
|
|
|
da2bf9 |
|
|
|
da2bf9 |
+int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names) {
|
|
|
da2bf9 |
+ return rtnl_update_link_alternative_names(rtnl, RTM_NEWLINKPROP, ifindex, alternative_names);
|
|
|
da2bf9 |
+}
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
+int rtnl_delete_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names) {
|
|
|
da2bf9 |
+ return rtnl_update_link_alternative_names(rtnl, RTM_DELLINKPROP, ifindex, alternative_names);
|
|
|
da2bf9 |
+}
|
|
|
da2bf9 |
+
|
|
|
da2bf9 |
int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret) {
|
|
|
da2bf9 |
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL;
|
|
|
da2bf9 |
int r;
|
|
|
da2bf9 |
diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
|
|
|
da2bf9 |
index ea98439fad..4fc31aa274 100644
|
|
|
da2bf9 |
--- a/src/libsystemd/sd-netlink/netlink-util.h
|
|
|
da2bf9 |
+++ b/src/libsystemd/sd-netlink/netlink-util.h
|
|
|
da2bf9 |
@@ -38,7 +38,9 @@ static inline bool rtnl_message_type_is_routing_policy_rule(uint16_t type) {
|
|
|
da2bf9 |
|
|
|
da2bf9 |
int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name);
|
|
|
da2bf9 |
int rtnl_set_link_properties(sd_netlink **rtnl, int ifindex, const char *alias, const struct ether_addr *mac, uint32_t mtu);
|
|
|
da2bf9 |
+int rtnl_get_link_alternative_names(sd_netlink **rtnl, int ifindex, char ***ret);
|
|
|
da2bf9 |
int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names);
|
|
|
da2bf9 |
+int rtnl_delete_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names);
|
|
|
da2bf9 |
int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret);
|
|
|
da2bf9 |
|
|
|
da2bf9 |
int rtnl_log_parse_error(int r);
|