diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-10-05 09:36:11 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-10-11 10:37:25 -0700 |
| commit | 6d23c6f42206809f985d3fc7d95fca0589522836 (patch) | |
| tree | e5ce568ab22c9ff76391bdd08ebc6cc33205c3f4 /lib | |
| parent | 3ee8a9f0027bbcbc92358048bb6e858eb32fe504 (diff) | |
netlink: New macros NL_NESTED_FOR_EACH, NL_NESTED_FOR_EACH_UNSAFE.
Upcoming commits will introduce more users.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/netlink-socket.c | 6 | ||||
| -rw-r--r-- | lib/netlink.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c index 0f4e3e77..160edd23 100644 --- a/lib/netlink-socket.c +++ b/lib/netlink-socket.c @@ -790,9 +790,8 @@ nl_lookup_genl_mcgroup(const char *family_name, const char *group_name, unsigned int *multicast_group, unsigned int fallback) { struct nlattr *family_attrs[ARRAY_SIZE(family_policy)]; - struct ofpbuf all_mcs; + const struct nlattr *mc; struct ofpbuf *reply; - struct nlattr *mc; unsigned int left; int error; @@ -810,8 +809,7 @@ nl_lookup_genl_mcgroup(const char *family_name, const char *group_name, goto exit; } - nl_attr_get_nested(family_attrs[CTRL_ATTR_MCAST_GROUPS], &all_mcs); - NL_ATTR_FOR_EACH (mc, left, all_mcs.data, all_mcs.size) { + NL_NESTED_FOR_EACH (mc, left, family_attrs[CTRL_ATTR_MCAST_GROUPS]) { static const struct nl_policy mc_policy[] = { [CTRL_ATTR_MCAST_GRP_ID] = {.type = NL_A_U32}, [CTRL_ATTR_MCAST_GRP_NAME] = {.type = NL_A_STRING}, diff --git a/lib/netlink.h b/lib/netlink.h index 2206339c..2d345716 100644 --- a/lib/netlink.h +++ b/lib/netlink.h @@ -124,6 +124,12 @@ nl_attr_is_valid(const struct nlattr *nla, size_t maxlen) (LEFT) > 0; \ (LEFT) -= NLA_ALIGN((ITER)->nla_len), (ITER) = nl_attr_next(ITER)) +/* These variants are convenient for iterating nested attributes. */ +#define NL_NESTED_FOR_EACH(ITER, LEFT, A) \ + NL_ATTR_FOR_EACH(ITER, LEFT, nl_attr_get(A), nl_attr_get_size(A)) +#define NL_NESTED_FOR_EACH_UNSAFE(ITER, LEFT, A) \ + NL_ATTR_FOR_EACH_UNSAFE(ITER, LEFT, nl_attr_get(A), nl_attr_get_size(A)) + /* Netlink attribute parsing. */ int nl_attr_type(const struct nlattr *); const void *nl_attr_get(const struct nlattr *); |