External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: netlink: Add some wrapper macros to get rid of redundancy

Browse Source 
This patch adds wrapper macros around nla_nest_[start|end] and nla_put,
thus getting rid of some redundancy and making virNetlinkNewLink more
readable.

Signed-off-by: Shi Lei <shi_lei@massclouds.com>
Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Shi Lei 2018-09-07 15:17:25 +08:00 committed by Erik Skultety
parent a2e5aad003
commit b6ba2b961a
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/util/virnetlink.c
View File

@ -537,41 +537,27 @@ virNetlinkNewLink(const char *ifname,
if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0)
goto buffer_too_small;
if (ifname && nla_put(nl_msg, IFLA_IFNAME,
(strlen(ifname) + 1), ifname) < 0)
goto buffer_too_small;
NETLINK_MSG_PUT(nl_msg, IFLA_IFNAME, (strlen(ifname) + 1), ifname);
if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO)))
goto buffer_too_small;
if (type && nla_put(nl_msg, IFLA_INFO_KIND, (strlen(type) + 1), type) < 0)
goto buffer_too_small;
NETLINK_MSG_NEST_START(nl_msg, linkinfo, IFLA_LINKINFO);
NETLINK_MSG_PUT(nl_msg, IFLA_INFO_KIND, (strlen(type) + 1), type);
if ((STREQ(type, "macvtap") || STREQ(type, "macvlan")) &&
extra_args &&
extra_args->macvlan_mode &&
*extra_args->macvlan_mode > 0) {
if (!(infodata = nla_nest_start(nl_msg, IFLA_INFO_DATA)))
goto buffer_too_small;
if (nla_put(nl_msg, IFLA_MACVLAN_MODE,
sizeof(uint32_t), extra_args->macvlan_mode) < 0)
goto buffer_too_small;
nla_nest_end(nl_msg, infodata);
NETLINK_MSG_NEST_START(nl_msg, infodata, IFLA_INFO_DATA);
NETLINK_MSG_PUT(nl_msg, IFLA_MACVLAN_MODE,
sizeof(uint32_t), extra_args->macvlan_mode);
NETLINK_MSG_NEST_END(nl_msg, infodata);
}
nla_nest_end(nl_msg, linkinfo);
NETLINK_MSG_NEST_END(nl_msg, linkinfo);
if (extra_args) {
if (extra_args->ifindex &&
nla_put(nl_msg, IFLA_LINK,
sizeof(uint32_t), extra_args->ifindex) < 0)
goto buffer_too_small;
if (extra_args->mac &&
nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, extra_args->mac) < 0)
goto buffer_too_small;
NETLINK_MSG_PUT(nl_msg, IFLA_LINK,
sizeof(uint32_t), extra_args->ifindex);
NETLINK_MSG_PUT(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, extra_args->mac);
}
if (virNetlinkCommand(nl_msg, &resp, &buflen, 0, 0, NETLINK_ROUTE, 0) < 0)

23
src/util/virnetlink.h
View File

@ -48,6 +48,29 @@ struct nlmsghdr;
# endif /* __linux__ */
# define NETLINK_MSG_NEST_START(msg, container, attrtype) \
do { \
container = nla_nest_start(msg, attrtype); \
if (!container) \
goto buffer_too_small; \
} while(0)
# define NETLINK_MSG_NEST_END(msg, container) \
do { nla_nest_end(msg, container); } while(0)
/*
* we need to use an intermediary pointer to @data as compilers may sometimes
* complain about @data not being a pointer type:
* error: the address of 'foo' will always evaluate as 'true' [-Werror=address]
*/
# define NETLINK_MSG_PUT(msg, attrtype, datalen, data) \
do { \
const void *dataptr = data; \
if (dataptr && nla_put(msg, attrtype, datalen, dataptr) < 0) \
goto buffer_too_small; \
} while(0)
int virNetlinkStartup(void);
void virNetlinkShutdown(void);