Merge branch 'nf-next' of git://1984.lsi.us.es/net-next (c5e1fd8c) · Commits · e / devices / android_kernel_oneplus_sm8150

include/linux/netfilter/Kbuild

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,7 +5,9 @@ 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_acct.h
		header-y += nfnetlink_compat.h
		header-y += nfnetlink_conntrack.h
		header-y += nfnetlink_log.h
		@@ -21,6 +23,7 @@ header-y += xt_DSCP.h
		header-y += xt_IDLETIMER.h
		header-y += xt_LED.h
		header-y += xt_MARK.h
		header-y += xt_nfacct.h
		header-y += xt_NFLOG.h
		header-y += xt_NFQUEUE.h
		header-y += xt_RATEEST.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@ enum ip_conntrack_status {
		/* Conntrack is a fake untracked entry */
		IPS_UNTRACKED_BIT = 12,
		IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),

		/* Conntrack has a userspace helper. */
		IPS_USERSPACE_HELPER_BIT = 13,
		IPS_USERSPACE_HELPER = (1 << IPS_USERSPACE_HELPER_BIT),
		};

		/* Connection tracking event types */

+27 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,33 @@ enum ip_conntrack_dir {
		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)

		#endif /* _NF_CONNTRACK_TUPLE_COMMON_H */

0 → 100644

+25 −0

Original line number	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 */

+2 −1