Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54dad51 authored by Eric B Munson's avatar Eric B Munson Committed by Jozsef Kadlecsik
Browse files

netfilter: ipset: Add element count to hash headers 



It would be useful for userspace to query the size of an ipset hash,
however, this data is not exposed to userspace outside of counting the
number of member entries.  This patch uses the attribute
IPSET_ATTR_ELEMENTS to indicate the size in the the header that is
exported to userspace.  This field is then printed by the userspace
tool for hashes.

Signed-off-by: default avatarEric B Munson <emunson@akamai.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Josh Hunt <johunt@akamai.com>
Cc: netfilter-devel@vger.kernel.org
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 837a90ea

net/netfilter/ipset/ip_set_hash_gen.h

+2 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,8 @@ mtype_head(struct ip_set *set, struct sk_buff *skb) 
		goto nla_put_failure;

#endif

	if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref)) ||

	    nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)))

	    nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)) ||

	    nla_put_net32(skb, IPSET_ATTR_ELEMENTS, htonl(h->elements)))

		goto nla_put_failure;

	if (unlikely(ip_set_put_flags(skb, set)))

		goto nla_put_failure;