netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <basile@opensource.dyc.edu>
To: davem@davemloft.net
Cc: kaber@trash.net, basile@opensource.dyc.edu, blueness@gentoo.org,
	gurligebis@gentoo.org, base-system@gentoo.org, kernel@gentoo.org,
	toolchain@gentoo.org, mchehab@redhat.com, hverkuil@xs4all.nl,
	laurent.pinchart@ideasonboard.com, arnd@arndb.de,
	eparis@redhat.com, netfilter-devel@vger.kernel.org
Subject: [PATCH] netfilter: export sanitized nf_nat.h to INSTALL_HDR_PATH
Date: Sat,  1 Oct 2011 13:51:29 -0400	[thread overview]
Message-ID: <1317491489-23812-1-git-send-email-basile@opensource.dyc.edu> (raw)

From: "Anthony G. Basile" <basile@opensource.dyc.edu>

This exports the sanitized version of nf_nat.h for userland
applications, like iptables and miniupnpd, which make use of
binary representations of NAT provided by netfilter.

This patch makes the API header public by installing it in
INSTALL_HDR_PATH.

See: https://bugs.gentoo.org/376873

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 include/linux/netfilter/Kbuild   |    1 +
 include/linux/netfilter/nf_nat.h |   39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 include/linux/netfilter/nf_nat.h

diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index a1b410c..d81f771 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h
 header-y += nf_conntrack_sctp.h
 header-y += nf_conntrack_tcp.h
 header-y += nf_conntrack_tuple_common.h
+header-y += nf_nat.h
 header-y += nfnetlink.h
 header-y += nfnetlink_compat.h
 header-y += nfnetlink_conntrack.h
diff --git a/include/linux/netfilter/nf_nat.h b/include/linux/netfilter/nf_nat.h
new file mode 100644
index 0000000..3360f39
--- /dev/null
+++ b/include/linux/netfilter/nf_nat.h
@@ -0,0 +1,39 @@
+#ifndef _NF_NAT_H
+#define _NF_NAT_H
+#include <linux/types.h>
+
+#define IP_NAT_RANGE_MAP_IPS 1
+#define IP_NAT_RANGE_PROTO_SPECIFIED 2
+#define IP_NAT_RANGE_PROTO_RANDOM 4
+#define IP_NAT_RANGE_PERSISTENT 8
+
+/* The protocol-specific manipulable parts of the tuple */
+union nf_conntrack_man_proto {
+	__be16 all;
+	__be16 port;
+	__be16 icmp_idnt;
+	__be16 gre_key;
+};
+
+/* Single range specification. */
+struct nf_nat_range {
+	/* Set to OR of flags above. */
+	unsigned int flags;
+
+	/* Inclusive: network order. */
+	__be32 min_ip, max_ip;
+
+	/* Inclusive: network order */
+	union nf_conntrack_man_proto min, max;
+};
+
+/* For backwards compat: don't use in modern code. */
+struct nf_nat_multi_range_compat {
+	unsigned int rangesize; /* Must be 1. */
+
+	/* hangs off end. */
+	struct nf_nat_range range[1];
+};
+
+#define nf_nat_multi_range nf_nat_multi_range_compat
+#endif
-- 
1.7.6.1


             reply	other threads:[~2011-10-01 17:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-01 17:51 Anthony G. Basile [this message]
2011-10-01 17:54 ` [PATCH] netfilter: export sanitized nf_nat.h to INSTALL_HDR_PATH Anthony G. Basile
2011-10-02 12:53   ` Jan Engelhardt
2011-10-02 13:01     ` Anthony G. Basile
2011-10-11  1:40       ` Pablo Neira Ayuso
2011-10-11 21:34         ` Anthony G. Basile

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=1317491489-23812-1-git-send-email-basile@opensource.dyc.edu \
    --to=basile@opensource.dyc.edu \
    --cc=arnd@arndb.de \
    --cc=base-system@gentoo.org \
    --cc=blueness@gentoo.org \
    --cc=davem@davemloft.net \
    --cc=eparis@redhat.com \
    --cc=gurligebis@gentoo.org \
    --cc=hverkuil@xs4all.nl \
    --cc=kaber@trash.net \
    --cc=kernel@gentoo.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=mchehab@redhat.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=toolchain@gentoo.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).