From: Jan Engelhardt <jengelh@medozas.de>
To: kadlec@blackhole.kfki.hu
Cc: netfilter-devel@vger.kernel.org
Subject: ipset: use NFPROTO_ constants
Date: Thu, 25 Aug 2011 11:20:55 +0200 [thread overview]
Message-ID: <1314264057-5681-1-git-send-email-jengelh@medozas.de> (raw)
I have changed the special variant _INET46 to _X_INET46 in
line with the "X-Something"-style headers that HTTP and mail
use, and I hope that copying the constants into nfproto.h
was right (given that nf_inet_addr.h was also copied).
===
The following changes since commit cdb6bb6cf01909e84bae99af0d83946884f24611:
ipset 6.8 released (2011-07-11 11:10:47 +0200)
are available in the git repository at:
git://dev.medozas.de/ipset master
Jan Engelhardt (1):
ipset: use NFPROTO_ constants
include/libipset/nfproto.h | 19 +++++++
include/libipset/types.h | 15 +++--
kernel/include/linux/netfilter/ipset/ip_set.h | 5 ++-
kernel/net/netfilter/ipset/ip_set_bitmap_ip.c | 4 +-
kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 +-
kernel/net/netfilter/ipset/ip_set_bitmap_port.c | 4 +-
kernel/net/netfilter/ipset/ip_set_core.c | 16 +++---
kernel/net/netfilter/ipset/ip_set_getport.c | 4 +-
kernel/net/netfilter/ipset/ip_set_hash_ip.c | 18 +++---
kernel/net/netfilter/ipset/ip_set_hash_ipport.c | 10 ++--
kernel/net/netfilter/ipset/ip_set_hash_ipportip.c | 10 ++--
kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c | 12 ++--
kernel/net/netfilter/ipset/ip_set_hash_net.c | 12 ++--
kernel/net/netfilter/ipset/ip_set_hash_netiface.c | 12 ++--
kernel/net/netfilter/ipset/ip_set_hash_netport.c | 12 ++--
kernel/net/netfilter/ipset/ip_set_list_set.c | 2 +-
lib/data.c | 21 ++++----
lib/debug.c | 4 +-
lib/parse.c | 52 ++++++++++----------
lib/print.c | 20 ++++----
lib/session.c | 34 ++++++------
lib/types.c | 26 +++++-----
src/ipset.c | 10 ++--
src/ipset_bitmap_ip.c | 2 +-
src/ipset_bitmap_ipmac.c | 2 +-
src/ipset_bitmap_port.c | 2 +-
src/ipset_hash_ip.c | 2 +-
src/ipset_hash_ipport.c | 2 +-
src/ipset_hash_ipportip.c | 2 +-
src/ipset_hash_ipportnet.c | 4 +-
src/ipset_hash_net.c | 4 +-
src/ipset_hash_netiface.c | 2 +-
src/ipset_hash_netport.c | 4 +-
src/ipset_list_set.c | 2 +-
34 files changed, 189 insertions(+), 165 deletions(-)
create mode 100644 include/libipset/nfproto.h
next reply other threads:[~2011-08-25 9:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 9:20 Jan Engelhardt [this message]
2011-08-25 9:20 ` [PATCH] ipset: use NFPROTO_ constants Jan Engelhardt
2011-08-25 11:52 ` Amos Jeffries
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=1314264057-5681-1-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kadlec@blackhole.kfki.hu \
--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).