From: Oliver <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH 0/6] Add new comments extension to ipset.
Date: Tue, 17 Sep 2013 15:13:19 +0200 [thread overview]
Message-ID: <1379423605-22777-1-git-send-email-oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa> (raw)
From: Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
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@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
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
next reply other threads:[~2013-09-17 13:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-17 13:13 Oliver [this message]
2013-09-17 13:13 ` [PATCH 1/6] netfilter: ipset: Support comments for ipset entries in the core Oliver
2013-09-18 17:56 ` Jozsef Kadlecsik
2013-09-17 13:13 ` [PATCH 2/6] netfilter: ipset: Support comments in hash-type ipsets Oliver
2013-09-18 18:03 ` Jozsef Kadlecsik
2013-09-17 13:13 ` [PATCH 3/6] netfilter: ipset: Support comments in bitmap-type ipsets Oliver
2013-09-17 13:13 ` [PATCH 4/6] ipset: Rework the "fake" argument parsing for ipset restore Oliver
2013-09-18 18:22 ` Jozsef Kadlecsik
2013-09-19 14:56 ` Oliver
2013-09-17 13:13 ` [PATCH 5/6] ipset: Support comments in the userspace library Oliver
2013-09-18 18:43 ` Jozsef Kadlecsik
2013-09-18 18:49 ` Jozsef Kadlecsik
2013-09-19 14:35 ` Oliver
2013-09-19 18:37 ` Jozsef Kadlecsik
2013-09-20 7:15 ` Oliver
2013-09-17 13:13 ` [PATCH 6/6] ipset: Add new userspace set revisions for comment support Oliver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1379423605-22777-1-git-send-email-oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa \
--to=oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).