From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> This patch series adds support for a comments extensions on all ipset types via the new extensions handling code implemented recently. A few small changes have been made to the destroy code to make it usable in a generic manner as well as relocating it within the header to enable it to compile (the set struct needed to be completely defined in order to actually check whether to do cleanup). Signed-off-by: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Oliver Smith (6): netfilter: ipset: Support comments for ipset entries in the core. netfilter: ipset: Support comments in hash-type ipsets. netfilter: ipset: Support comments in bitmap-type ipsets. ipset: Rework the "fake" argument parsing for ipset restore. ipset: Support comments in the userspace library. ipset: Add new userspace set revisions for comment support Make_global.am | 2 +- include/libipset/data.h | 6 +- include/libipset/linux_ip_set.h | 7 + include/libipset/parse.h | 2 + include/libipset/print.h | 3 + kernel/include/linux/netfilter/ipset/ip_set.h | 40 ++++- .../include/linux/netfilter/ipset/ip_set_comment.h | 54 ++++++ kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 4 + kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | 10 +- kernel/net/netfilter/ipset/ip_set_bitmap_ip.c | 3 +- kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c | 3 +- kernel/net/netfilter/ipset/ip_set_bitmap_port.c | 3 +- kernel/net/netfilter/ipset/ip_set_core.c | 14 ++ kernel/net/netfilter/ipset/ip_set_hash_gen.h | 10 +- kernel/net/netfilter/ipset/ip_set_hash_ip.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_ipport.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_ipportip.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_net.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_netiface.c | 3 +- kernel/net/netfilter/ipset/ip_set_hash_netport.c | 3 +- lib/data.c | 34 ++++ lib/debug.c | 1 + lib/errcode.c | 2 + lib/ipset_bitmap_ip.c | 114 ++++++++++++ lib/ipset_bitmap_ipmac.c | 118 +++++++++++++ lib/ipset_bitmap_port.c | 107 +++++++++++ lib/ipset_hash_ip.c | 138 +++++++++++++++ lib/ipset_hash_ipport.c | 161 +++++++++++++++++ lib/ipset_hash_ipportnet.c | 195 +++++++++++++++++++++ lib/ipset_hash_net.c | 145 +++++++++++++++ lib/ipset_hash_netnet.c | 14 +- lib/ipset_hash_netport.c | 158 +++++++++++++++++ lib/libipset.map | 6 + lib/parse.c | 27 +++ lib/print.c | 31 ++++ lib/session.c | 8 +- lib/types.c | 4 +- src/ipset.c | 40 ++++- 39 files changed, 1451 insertions(+), 34 deletions(-) create mode 100644 kernel/include/linux/netfilter/ipset/ip_set_comment.h -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
