SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network,udev/net: add Kind= settings in [Match] section

Browse Source 
This may be useful for writing .network or .link files matching with
virtual interfaces.

Closes #22541.
This commit is contained in:
Yu Watanabe
2022-02-17 23:10:26 +09:00
parent 430f07f4f8
commit 65022cd7ab
14 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-netlink/netlink-util.c
+17
View File
@@ -366,11 +366,13 @@ int rtnl_get_link_info(
int ifindex,
unsigned short *ret_iftype,
unsigned *ret_flags,
char **ret_kind,
struct hw_addr_data *ret_hw_addr,
struct hw_addr_data *ret_permanent_hw_addr) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL;
struct hw_addr_data addr = HW_ADDR_NULL, perm_addr = HW_ADDR_NULL;
_cleanup_free_ char *kind = NULL;
unsigned short iftype;
unsigned flags;
int r;
@@ -409,6 +411,19 @@ int rtnl_get_link_info(
return r;
}
if (ret_kind) {
r = sd_netlink_message_enter_container(reply, IFLA_LINKINFO);
if (r >= 0) {
r = sd_netlink_message_read_string_strdup(reply, IFLA_INFO_KIND, &kind);
if (r < 0 && r != -ENODATA)
return r;
r = sd_netlink_message_exit_container(reply);
if (r < 0)
return r;
}
}
if (ret_hw_addr) {
r = netlink_message_read_hw_addr(reply, IFLA_ADDRESS, &addr);
if (r < 0 && r != -ENODATA)
@@ -425,6 +440,8 @@ int rtnl_get_link_info(
*ret_iftype = iftype;
if (ret_flags)
*ret_flags = flags;
if (ret_kind)
*ret_kind = TAKE_PTR(kind);
if (ret_hw_addr)
*ret_hw_addr = addr;
if (ret_permanent_hw_addr)
src/libsystemd/sd-netlink/netlink-util.h
+1
View File
@@ -94,6 +94,7 @@ int rtnl_get_link_info(
int ifindex,
unsigned short *ret_iftype,
unsigned *ret_flags,
char **ret_kind,
struct hw_addr_data *ret_hw_addr,
struct hw_addr_data *ret_permanent_hw_addr);