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

Commit cbc9f2f4 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: export NAT definitions to userspace 



Export the NAT definitions to userspace. So far userspace (specifically,
iptables) has been copying the headers files from include/net. Also
rename some structures and definitions in preparation for IPv6 NAT.
Since these have never been officially exported, this doesn't affect
existing userspace code.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3d058d7b

include/linux/netfilter/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h 
header-y += nf_conntrack_sctp.h

header-y += nf_conntrack_sctp.h

header-y += nf_conntrack_tcp.h

header-y += nf_conntrack_tcp.h

header-y += nf_conntrack_tuple_common.h

header-y += nf_conntrack_tuple_common.h

header-y += nf_nat.h

header-y += nfnetlink.h

header-y += nfnetlink.h

header-y += nfnetlink_compat.h

header-y += nfnetlink_compat.h

header-y += nfnetlink_conntrack.h

header-y += nfnetlink_conntrack.h

include/linux/netfilter/nf_conntrack_tuple_common.h

+27 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,33 @@ enum ip_conntrack_dir { 
	IP_CT_DIR_MAX

	IP_CT_DIR_MAX

};

};





/* The protocol-specific manipulable parts of the tuple: always in

 * network order

 */

union nf_conntrack_man_proto {

	/* Add other protocols here. */

	__be16 all;



	struct {

		__be16 port;

	} tcp;

	struct {

		__be16 port;

	} udp;

	struct {

		__be16 id;

	} icmp;

	struct {

		__be16 port;

	} dccp;

	struct {

		__be16 port;

	} sctp;

	struct {

		__be16 key;	/* GRE key is 32bit, PPtP only uses 16bit */

	} gre;

};



#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)

#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)





#endif /* _NF_CONNTRACK_TUPLE_COMMON_H */
 
#endif /* _NF_CONNTRACK_TUPLE_COMMON_H */

include/linux/netfilter/nf_nat.h

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
#ifndef _NETFILTER_NF_NAT_H

#define _NETFILTER_NF_NAT_H



#include <linux/netfilter.h>

#include <linux/netfilter/nf_conntrack_tuple_common.h>



#define NF_NAT_RANGE_MAP_IPS		1

#define NF_NAT_RANGE_PROTO_SPECIFIED	2

#define NF_NAT_RANGE_PROTO_RANDOM	4

#define NF_NAT_RANGE_PERSISTENT		8



struct nf_nat_ipv4_range {

	unsigned int			flags;

	__be32				min_ip;

	__be32				max_ip;

	union nf_conntrack_man_proto	min;

	union nf_conntrack_man_proto	max;

};



struct nf_nat_ipv4_multi_range_compat {

	unsigned int			rangesize;

	struct nf_nat_ipv4_range	range[1];

};



#endif /* _NETFILTER_NF_NAT_H */

include/linux/netfilter_ipv4/Kbuild

+0 −1
Original line number Original line Diff line number Diff line
@@ -12,4 +12,3 @@ header-y += ipt_ah.h 
header-y += ipt_ecn.h

header-y += ipt_ecn.h

header-y += ipt_realm.h

header-y += ipt_realm.h

header-y += ipt_ttl.h
 
header-y += ipt_ttl.h
 
header-y += nf_nat.h

include/linux/netfilter_ipv4/nf_nat.h

deleted100644 → 0
+0 −58
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_NF_NAT_H

#define _LINUX_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 {

	/* Add other protocols here. */

	__be16 all;



	struct {

		__be16 port;

	} tcp;

	struct {

		__be16 port;

	} udp;

	struct {

		__be16 id;

	} icmp;

	struct {

		__be16 port;

	} dccp;

	struct {

		__be16 port;

	} sctp;

	struct {

		__be16 key;	/* GRE key is 32bit, PPtP only uses 16bit */

	} gre;

};



/* 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