From 897e184c7d54156357fd204beafe06ab9bd0341a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 10 May 2014 19:38:32 +0200 Subject: rtnl: change from bitmask to enum for rtnl groups The bitmask is deprecated in the kernel, so move to the new interface. At the moment this does not make a difference for us, but it avoids having to change the API in the future. --- src/libsystemd/sd-rtnl/sd-rtnl.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'src/libsystemd') diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c index 543bad9f4f..4ee360c0a8 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -75,8 +75,27 @@ static bool rtnl_pid_changed(sd_rtnl *rtnl) { return rtnl->original_pid != getpid(); } -int sd_rtnl_open(sd_rtnl **ret, uint32_t groups) { +static int rtnl_compute_groups_ap(uint32_t *_groups, unsigned n_groups, va_list ap) { + uint32_t groups = 0; + unsigned i; + + for (i = 0; i < n_groups; i++) { + unsigned group; + + group = va_arg(ap, unsigned); + assert_return(group < 32, -EINVAL); + + groups |= group ? (1 << (group - 1)) : 0; + } + + *_groups = groups; + + return 0; +} + +int sd_rtnl_open(sd_rtnl **ret, unsigned n_groups, ...) { _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + va_list ap; socklen_t addrlen; int r, one = 1; @@ -93,7 +112,11 @@ int sd_rtnl_open(sd_rtnl **ret, uint32_t groups) { if (setsockopt(rtnl->fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) return -errno; - rtnl->sockaddr.nl.nl_groups = groups; + va_start(ap, n_groups); + r = rtnl_compute_groups_ap(&rtnl->sockaddr.nl.nl_groups, n_groups, ap); + va_end(ap); + if (r < 0) + return r; addrlen = sizeof(rtnl->sockaddr); -- cgit v1.2.3-54-g00ecf