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

Commit d79aec83 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nf-next' of git://1984.lsi.us.es/net-next

parents c3b084c2 54b07dca

include/linux/netfilter/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ header-y += xt_cpu.h 
header-y += xt_dccp.h

header-y += xt_devgroup.h

header-y += xt_dscp.h

header-y += xt_ecn.h

header-y += xt_esp.h

header-y += xt_hashlimit.h

header-y += xt_helper.h

include/linux/netfilter/xt_ecn.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* iptables module for matching the ECN header in IPv4 and TCP header

 *

 * (C) 2002 Harald Welte <laforge@gnumonks.org>

 *

 * This software is distributed under GNU GPL v2, 1991

 * 

 * ipt_ecn.h,v 1.4 2002/08/05 19:39:00 laforge Exp

*/

#ifndef _XT_ECN_H

#define _XT_ECN_H



#include <linux/types.h>

#include <linux/netfilter/xt_dscp.h>



#define XT_ECN_IP_MASK	(~XT_DSCP_MASK)



#define XT_ECN_OP_MATCH_IP	0x01

#define XT_ECN_OP_MATCH_ECE	0x10

#define XT_ECN_OP_MATCH_CWR	0x20



#define XT_ECN_OP_MATCH_MASK	0xce



/* match info */

struct xt_ecn_info {

	__u8 operation;

	__u8 invert;

	__u8 ip_ect;

	union {

		struct {

			__u8 ect;

		} tcp;

	} proto;

};



#endif /* _XT_ECN_H */

include/linux/netfilter_ipv4/ipt_ecn.h

+9 −29
Original line number Diff line number Diff line 
/* iptables module for matching the ECN header in IPv4 and TCP header

 *

 * (C) 2002 Harald Welte <laforge@gnumonks.org>

 *

 * This software is distributed under GNU GPL v2, 1991

 * 

 * ipt_ecn.h,v 1.4 2002/08/05 19:39:00 laforge Exp

*/

#ifndef _IPT_ECN_H

#define _IPT_ECN_H



#include <linux/types.h>

#include <linux/netfilter/xt_dscp.h>

#include <linux/netfilter/xt_ecn.h>

#define ipt_ecn_info xt_ecn_info



#define IPT_ECN_IP_MASK	(~XT_DSCP_MASK)



#define IPT_ECN_OP_MATCH_IP	0x01

#define IPT_ECN_OP_MATCH_ECE	0x10

#define IPT_ECN_OP_MATCH_CWR	0x20



#define IPT_ECN_OP_MATCH_MASK	0xce



/* match info */

struct ipt_ecn_info {

	__u8 operation;

	__u8 invert;

	__u8 ip_ect;

	union {

		struct {

			__u8 ect;

		} tcp;

	} proto;

enum {

	IPT_ECN_IP_MASK       = XT_ECN_IP_MASK,

	IPT_ECN_OP_MATCH_IP   = XT_ECN_OP_MATCH_IP,

	IPT_ECN_OP_MATCH_ECE  = XT_ECN_OP_MATCH_ECE,

	IPT_ECN_OP_MATCH_CWR  = XT_ECN_OP_MATCH_CWR,

	IPT_ECN_OP_MATCH_MASK = XT_ECN_OP_MATCH_MASK,

};



#endif /* _IPT_ECN_H */
 
#endif /* IPT_ECN_H */

net/ipv4/netfilter/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config NF_CONNTRACK_IPV4 


config NF_CONNTRACK_PROC_COMPAT

	bool "proc/sysctl compatibility with old connection tracking"

	depends on NF_CONNTRACK_IPV4

	depends on NF_CONNTRACK_PROCFS && NF_CONNTRACK_IPV4

	default y

	help

	  This option enables /proc and sysctl compatibility with the old
@@ -76,11 +76,11 @@ config IP_NF_MATCH_AH 
config IP_NF_MATCH_ECN

	tristate '"ecn" match support'

	depends on NETFILTER_ADVANCED

	help

	  This option adds a `ECN' match, which allows you to match against

	  the IPv4 and TCP header ECN fields.



	  To compile it as a module, choose M here.  If unsure, say N.

	select NETFILTER_XT_MATCH_ECN

	---help---

	This is a backwards-compat option for the user's convenience

	(e.g. when running oldconfig). It selects

	CONFIG_NETFILTER_XT_MATCH_ECN.



config IP_NF_MATCH_RPFILTER

	tristate '"rpfilter" reverse path filter match support'

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.o 


# matches

obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o

obj-$(CONFIG_IP_NF_MATCH_RPFILTER) += ipt_rpfilter.o



# targets