: Netfilter Update
Subsystems (2)
cover : Netfilter Update
Hi Dave,
following are my netfilter patches for 2.6.17. The "fix expectation notifier unregistration" should go in -stable too, I'll send it there separately. Please apply.
include/linux/netfilter/x_tables.h | 67 + include/linux/netfilter/xt_multiport.h | 30 include/linux/netfilter_ipv4/ip_tables.h | 18 include/linux/netfilter_ipv4/ipt_multiport.h | 31 include/linux/netfilter_ipv6/ip6t_multiport.h | 25 net/compat.c | 3 net/ipv4/netfilter/Kconfig | 10 net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/ip_conntrack_netlink.c | 2 net/ipv4/netfilter/ip_tables.c | 1286 +++++++++++++++++++++----- net/ipv4/netfilter/ipt_multiport.c | 195 --- net/ipv6/netfilter/Kconfig | 10 net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/ip6t_multiport.c | 125 -- net/netfilter/Kconfig | 10 net/netfilter/Makefile | 1 net/netfilter/nf_conntrack_netlink.c | 6 net/netfilter/x_tables.c | 113 ++ net/netfilter/xt_multiport.c | 314 ++++++ 19 files changed, 1656 insertions(+), 592 deletions(-)
Dmitry Mishin:
[NETFILTER]: iptables 32bit compat layer
Martin Josefsson:
[NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink [NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration
Yasuyuki Kozakai:
[NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
PATCH 1/4 : x_tables: unify IPv4/IPv6 multiport match
[NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
This unifies ipt_multiport and ip6t_multiport to xt_multiport. As a result, this addes support for inversion and port range match to IPv6 packets.
---
commit 4d5ee8549d2385d700967246fb8ff6cc1828ceb1
tree 6d3915db257ab1cb3b15cfc7afa341f3841a2f1b
parent 6b0b3ab9f047358723d8b3116b71318f64088a1a
author Yasuyuki Kozakai <[email protected]> Wed, 29 Mar 2006 10:07:52 +0200 committer Patrick McHardy <[email protected]> Wed, 29 Mar 2006 10:07:52 +0200
include/linux/netfilter/xt_multiport.h | 30 ++ include/linux/netfilter_ipv4/ipt_multiport.h | 31 +- include/linux/netfilter_ipv6/ip6t_multiport.h | 25 +- net/ipv4/netfilter/Kconfig | 10 - net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/ipt_multiport.c | 195 ---------------- net/ipv6/netfilter/Kconfig | 10 - net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/ip6t_multiport.c | 125 ---------- net/netfilter/Kconfig | 10 + net/netfilter/Makefile | 1 net/netfilter/xt_multiport.c | 314 +++++++++++++++++++++++++ 12 files changed, 372 insertions(+), 381 deletions(-)
include/linux/netfilter/xt_multiport.h new file +30 -0
@@ -0,0 +1,30 @@ +#ifndef _XT_MULTIPORT_H +#define _XT_MULTIPORT_H + +enum xt_multiport_flags +{ +XT_MULTIPORT_SOURCE , +XT_MULTIPORT_DESTINATION , +XT_MULTIPORT_EITHER +}; + +#define XT_MULTI_PORTS 15 + +/* Must fit inside union xt_matchinfo: 16 bytes */ +struct xt_multiport +{ +u_int8_t flags;/* Type of comparison */ +u_int8_t count;/* Number of ports */ +u_int16_t ports[XT_MULTI_PORTS ];/* Ports */ +}; + +struct xt_multiport_v1 +{ +u_int8_t flags;/* Type of comparison */ +u_int8_t count;/* Number of ports */ +u_int16_t ports[XT_MULTI_PORTS ];/* Ports */ +u_int8_t pflags[XT_MULTI_PORTS ];/* Port flags */ +u_int8_t invert;/* Invert flag */ +}; + +#endif /*_XT_MULTIPORT_H*/
include/linux/netfilter_ipv4/ipt_multiport.h +8 -23
@@ -1,30 +1,15 @@#ifndef _IPT_MULTIPORT_H#define _IPT_MULTIPORT_H -#include <linux/netfilter_ipv4/ip_tables.h> -enum ipt_multiport_flags -{ -IPT_MULTIPORT_SOURCE , -IPT_MULTIPORT_DESTINATION , -IPT_MULTIPORT_EITHER -}; +#include <linux/netfilter/xt_multiport.h> -#define IPT_MULTI_PORTS 15 +#define IPT_MULTIPORT_SOURCE XT_MULTIPORT_SOURCE +#define IPT_MULTIPORT_DESTINATION XT_MULTIPORT_DESTINATION +#define IPT_MULTIPORT_EITHER XT_MULTIPORT_EITHER -/* Must fit inside union ipt_matchinfo: 16 bytes */ -struct ipt_multiport -{ -u_int8_t flags;/* Type of comparison */ -u_int8_t count;/* Number of ports */ -u_int16_t ports[IPT_MULTI_PORTS ];/* Ports */ -}; +#define IPT_MULTI_PORTS XT_MULTI_PORTS + +#define ipt_multiport xt_multiport +#define ipt_multiport_v1 xt_multiport_v1 -struct ipt_multiport_v1 -{ -u_int8_t flags;/* Type of comparison */ -u_int8_t count;/* Number of ports */ -u_int16_t ports[IPT_MULTI_PORTS ];/* Ports */ -u_int8_t pflags[IPT_MULTI_PORTS ];/* Port flags */ -u_int8_t invert;/* Invert flag */ -};#endif /*_IPT_MULTIPORT_H*/
include/linux/netfilter_ipv6/ip6t_multiport.h +9 -16
@@ -1,21 +1,14 @@#ifndef _IP6T_MULTIPORT_H#define _IP6T_MULTIPORT_H -#include <linux/netfilter_ipv6/ip6_tables.h> -enum ip6t_multiport_flags -{ -IP6T_MULTIPORT_SOURCE , -IP6T_MULTIPORT_DESTINATION , -IP6T_MULTIPORT_EITHER -}; +#include <linux/netfilter/xt_multiport.h> -#define IP6T_MULTI_PORTS 15 +#define IP6T_MULTIPORT_SOURCE XT_MULTIPORT_SOURCE +#define IP6T_MULTIPORT_DESTINATION XT_MULTIPORT_DESTINATION +#define IP6T_MULTIPORT_EITHER XT_MULTIPORT_EITHER -/* Must fit inside union ip6t_matchinfo: 16 bytes */ -struct ip6t_multiport -{ -u_int8_t flags;/* Type of comparison */ -u_int8_t count;/* Number of ports */ -u_int16_t ports[IP6T_MULTI_PORTS ];/* Ports */ -}; -#endif /*_IPT_MULTIPORT_H*/ +#define IP6T_MULTI_PORTS XT_MULTI_PORTS + +#define ip6t_multiport xt_multiport + +#endif /*_IP6T_MULTIPORT_H*/
net/ipv4/netfilter/Kconfig +0 -10
@@ -221,16 +221,6 @@ config IP_NF_MATCH_IPRANGE To compile it as a module, choose M here. If unsure, say N. -config IP_NF_MATCH_MULTIPORT - tristate "Multiple port match support" - depends on IP_NF_IPTABLES - help - Multiport matching allows you to match TCP or UDP packets based on - a series of source or destination ports: normally a rule can only - match a single range of ports. - - To compile it as a module, choose M here. If unsure, say N. - config IP_NF_MATCH_TOS tristate "TOS match support" depends on IP_NF_IPTABLES
net/ipv4/netfilter/Makefile +0 -1
@@ -53,7 +53,6 @@ obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o # matches obj-$(CONFIG_IP_NF_MATCH_HASHLIMIT) += ipt_hashlimit.o obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o -obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
net/ipv4/netfilter/ipt_multiport.c deleted +0 -195
195 lines not on this page · raw message
net/ipv6/netfilter/Kconfig +0 -10
@@ -87,16 +87,6 @@ config IP6_NF_MATCH_HL To compile it as a module, choose M here. If unsure, say N. -config IP6_NF_MATCH_MULTIPORT - tristate "Multiple port match support" - depends on IP6_NF_IPTABLES - help - Multiport matching allows you to match TCP or UDP packets based on - a series of source or destination ports: normally a rule can only - match a single range of ports. - - To compile it as a module, choose M here. If unsure, say N. - config IP6_NF_MATCH_OWNER tristate "Owner match support" depends on IP6_NF_IPTABLES
net/ipv6/netfilter/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o -obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
net/ipv6/netfilter/ip6t_multiport.c deleted +0 -125
125 lines not on this page · raw message
net/netfilter/Kconfig +10 -0
@@ -298,6 +298,16 @@ config NETFILTER_XT_MATCH_POLICY To compile it as a module, choose M here. If unsure, say N. +config NETFILTER_XT_MATCH_MULTIPORT + tristate "Multiple port match support" + depends on NETFILTER_XTABLES + help + Multiport matching allows you to match TCP or UDP packets based on + a series of source or destination ports: normally a rule can only + match a single range of ports. + + To compile it as a module, choose M here. If unsure, say N. + config NETFILTER_XT_MATCH_PHYSDEV tristate '"physdev" match support' depends on NETFILTER_XTABLES && BRIDGE_NETFILTER
net/netfilter/Makefile +1 -0
@@ -41,6 +41,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += xt_limit.o obj-$(CONFIG_NETFILTER_XT_MATCH_MAC) += xt_mac.o obj-$(CONFIG_NETFILTER_XT_MATCH_MARK) += xt_mark.o +obj-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += xt_multiport.o obj-$(CONFIG_NETFILTER_XT_MATCH_POLICY) += xt_policy.o obj-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += xt_pkttype.o obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
net/netfilter/xt_multiport.c new file +314 -0
314 lines not on this page · raw message
PATCH 2/4 : fix ifdef for connmark support in nf_conntrack_netlink
In reply to Patrick McHardy[NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
When ctnetlink was ported from ip_conntrack to nf_conntrack two #ifdef's for connmark support were left unchanged and this code was never compiled.
Problem noticed by Daniel De Graaf.
---
commit ea8b4b5661cae27fae57fc5b992730ec2e44d21c
tree 09e7996acf5faa03f42616b2bc46f90365e9fe12
parent 4d5ee8549d2385d700967246fb8ff6cc1828ceb1
author Martin Josefsson <[email protected]> Wed, 29 Mar 2006 10:08:03 +0200 committer Patrick McHardy <[email protected]> Wed, 29 Mar 2006 10:08:03 +0200
net/netfilter/nf_conntrack_netlink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_netlink.c +2 -2
@@ -1022,7 +1022,7 @@ ctnetlink_change_conntrack(struct nf_conreturn err; } -#if defined(CONFIG_IP_NF_CONNTRACK_MARK ) +#if defined(CONFIG_NF_CONNTRACK_MARK )if (cda[CTA_MARK -1 ]) ct->mark =ntohl (*(u_int32_t *)NFA_DATA (cda[CTA_MARK -1 ]));#endif
@@ -1062,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattrreturn err; } -#if defined(CONFIG_IP_NF_CONNTRACK_MARK ) +#if defined(CONFIG_NF_CONNTRACK_MARK )if (cda[CTA_MARK -1 ]) ct->mark =ntohl (*(u_int32_t *)NFA_DATA (cda[CTA_MARK -1 ]));#endif
PATCH 3/4 : {ip, nf}_conntrack_netlink: fix expectation notifier unregistration
In reply to Patrick McHardy[NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration
This patch fixes expectation notifier unregistration on module unload to use ip_conntrack_expect_unregister_notifier(). This bug causes a soft lockup at the first expectation created after a rmmod ; insmod of this module.
Should go into -stable as well.
---
commit 75032ffac0484237a927b7517fc5926eb9846792
tree fab99dd04115ecd8d3e8f82dbea1b9af613c56d7
parent ea8b4b5661cae27fae57fc5b992730ec2e44d21c
author Martin Josefsson <[email protected]> Wed, 29 Mar 2006 10:08:13 +0200 committer Patrick McHardy <[email protected]> Wed, 29 Mar 2006 10:08:13 +0200
net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_conntrack_netlink.c +1 -1
@@ -1658,7 +1658,7 @@ static void __exit ctnetlink_exit(void)printk ("ctnetlink: unregistering from nfnetlink.\n" );#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS -ip_conntrack_unregister_notifier (&ctnl_notifier_exp); +ip_conntrack_expect_unregister_notifier (&ctnl_notifier_exp);ip_conntrack_unregister_notifier (&ctnl_notifier);#endif
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -1687,7 +1687,7 @@ static void __exit ctnetlink_exit(void)printk ("ctnetlink: unregistering from nfnetlink.\n" );#ifdef CONFIG_NF_CONNTRACK_EVENTS -nf_conntrack_unregister_notifier (&ctnl_notifier_exp); +nf_conntrack_expect_unregister_notifier (&ctnl_notifier_exp);nf_conntrack_unregister_notifier (&ctnl_notifier);#endif
PATCH 4/4 : iptables 32bit compat layer
In reply to Patrick McHardy[NETFILTER]: iptables 32bit compat layer
This patch extends current iptables compatibility layer in order to get 32bit iptables to work on 64bit kernel. Current layer is insufficient due to alignment checks both in kernel and user space tools.
Patch is for current net-2.6.17 with addition of move of ipt_entry_{match| target} definitions to xt_entry_{match|target}.
---
commit eceb89a7ceab57caa822175613ea8762a5442ea2
tree 71353d1cee25580de5dbd1812bf2933cd6be14d7
parent 75032ffac0484237a927b7517fc5926eb9846792
author Dmitry Mishin <[email protected]> Thu, 30 Mar 2006 18:00:16 +0200 committer Patrick McHardy <[email protected]> Thu, 30 Mar 2006 18:00:16 +0200
include/linux/netfilter/x_tables.h | 67 ++ include/linux/netfilter_ipv4/ip_tables.h | 18 net/compat.c | 3 net/ipv4/netfilter/ip_tables.c | 1286 +++++++++++++++++++++++++----- net/netfilter/x_tables.c | 113 +++ 5 files changed, 1280 insertions(+), 207 deletions(-)
include/linux/netfilter/x_tables.h +67 -0
@@ -142,6 +142,12 @@ struct xt_counters_info#define ASSERT_WRITE_LOCK (x)#include <linux/netfilter_ipv4/listhelp.h> +#ifdef CONFIG_COMPAT +#define COMPAT_TO_USER 1 +#define COMPAT_FROM_USER -1 +#define COMPAT_CALC_SIZE 0 +#endif +struct xt_match {struct list_head list;
@@ -175,6 +181,9 @@ struct xt_matchvoid (*destroy)(const struct xt_match *match,void *matchinfo,unsigned int matchinfosize); +/* Called when userspace align differs from kernel space one */ +int (*compat)(void *match,void **dstptr,int *size,int convert); +/* Set this to THIS_MODULE if you are a module, otherwise NULL */ struct module *me;
@@ -220,6 +229,9 @@ struct xt_targetvoid (*destroy)(const struct xt_target *target,void *targinfo,unsigned int targinfosize); +/* Called when userspace align differs from kernel space one */ +int (*compat)(void *target,void **dstptr,int *size,int convert); +/* Set this to THIS_MODULE if you are a module, otherwise NULL */ struct module *me;
@@ -314,6 +326,61 @@ extern void xt_proto_fini(int af);extern struct xt_table_info *xt_alloc_table_info (unsigned int size);extern void xt_free_table_info (struct xt_table_info *info); +#ifdef CONFIG_COMPAT +#include <net/compat.h> + +struct compat_xt_entry_match +{ +union { +struct { +u_int16_t match_size; +char name[XT_FUNCTION_MAXNAMELEN -1 ]; +u_int8_t revision; + } user; +u_int16_t match_size; + } u; +unsigned char data[0 ]; +}; + +struct compat_xt_entry_target +{ +union { +struct { +u_int16_t target_size; +char name[XT_FUNCTION_MAXNAMELEN -1 ]; +u_int8_t revision; + } user; +u_int16_t target_size; + } u; +unsigned char data[0 ]; +}; + +/* FIXME: this works only on 32 bit tasks +* need to change whole approach in order to calculate align as function of +* current task alignment */ + +struct compat_xt_counters +{ +u_int32_t cnt[4 ]; +}; + +struct compat_xt_counters_info +{ +char name[XT_TABLE_MAXNAMELEN ]; +compat_uint_t num_counters; +struct compat_xt_counters counters[0 ]; +}; + +#define COMPAT_XT_ALIGN (s) (((s) + (__alignof__(struct compat_xt_counters)-1)) \ + & ~(__alignof__(struct compat_xt_counters)-1)) + +extern void xt_compat_lock (int af); +extern void xt_compat_unlock (int af); +extern int xt_compat_match (void *match,void **dstptr,int *size,int convert); +extern int xt_compat_target (void *target,void **dstptr,int *size, +int convert); + +#endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ #endif /* _X_TABLES_H */
include/linux/netfilter_ipv4/ip_tables.h +18 -0
@@ -316,5 +316,23 @@ extern unsigned int ipt_do_table(struct void *userdata);#define IPT_ALIGN (s) XT_ALIGN(s) + +#ifdef CONFIG_COMPAT +#include <net/compat.h> + +struct compat_ipt_entry +{ +struct ipt_ip ip; +compat_uint_t nfcache; +u_int16_t target_offset; +u_int16_t next_offset; +compat_uint_t comefrom; +struct compat_xt_counters counters; +unsigned char elems[0 ]; +}; + +#define COMPAT_IPT_ALIGN (s) COMPAT_XT_ALIGN(s) + +#endif /* CONFIG_COMPAT */ #endif /*__KERNEL__*/ #endif /* _IPTABLES_H */
net/compat.c +1 -2
@@ -476,8 +476,7 @@ asmlinkage long compat_sys_setsockopt(inint err;struct socket *sock; -/* SO_SET_REPLACE seems to be the same in all levels */ -if (optname ==IPT_SO_SET_REPLACE ) +if (level ==SOL_IPV6 && optname ==IPT_SO_SET_REPLACE )return do_netfilter_replace (fd, level, optname, optval, optlen);
net/ipv4/netfilter/ip_tables.c +1081 -205
1,399 lines not on this page · raw message
net/netfilter/x_tables.c +113 -0
143 lines not on this page · raw message
David S. Miller
maintainerFrom: Patrick McHardy <[email protected]>
Date: Fri, 31 Mar 2006 03:09:05 +0200 (MEST)
Quoted 2 lines
Yasuyuki Kozakai:
[NETFILTER]:x_tables: unify IPv4/IPv6 multiport match
This first patch didn't apply, so I'm going to pass on all of these until you figure out what's wrong here.
The problem is the net/ipv6/netfilter/Makefile hunk.
@@ -10,7 +10,6 @@ obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) +=
obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o
-obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o
in my current tree the ip6t_ah.o line instead reads as:
obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o
It seems something is wrong with the tree you generated these patches against.
Please resubmit once you've fixed this, thanks.
Quoted 21 lines · David S. Miller
From: Patrick McHardy <[email protected]>
Date: Fri, 31 Mar 2006 03:09:05 +0200 (MEST)Quoted 2 lines
Yasuyuki Kozakai:
[NETFILTER]:x_tables: unify IPv4/IPv6 multiport matchThis first patch didn't apply, so I'm going to pass on all of these until you figure out what's wrong here.
The problem is the
net/ipv6/netfilter/Makefilehunk.(quoted diff) +0
-1@@ -10,7 +10,6 @@ obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o -obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.oin my current tree the ip6t_ah.o line instead reads as:
Quoted 6 lines
obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o
It seems something is wrong with the tree you generated these patches against.
Please resubmit once you've fixed this, thanks.
Sorry, I accidentally missed the first patch. I've attached it to this mail, with it the patches apply cleanly against the current tree. If you want me to resubmit the entire set anyway please say so. Thanks.
[NETFILTER]: x_tables: unify IPv4/IPv6 esp match
This unifies ipt_esp and ip6t_esp to xt_esp. Please note that now a user program needs to specify IPPROTO_ESP as protocol to use esp match with IPv6. This means that ip6tables requires '-p esp' like iptables.
---
commit 6b0b3ab9f047358723d8b3116b71318f64088a1a
tree 0e8d7dcd24ee91e251d8451a7dec51eed50ea338
parent 91b9a1a505eb4b947318aaba4aed65fec9ccc88b
author Yasuyuki Kozakai <[email protected]> Wed, 29 Mar 2006 10:05:53 +0200 committer Patrick McHardy <[email protected]> Wed, 29 Mar 2006 10:05:53 +0200
include/linux/netfilter/xt_esp.h | 14 +++ include/linux/netfilter_ipv4/ipt_esp.h | 14 +-- include/linux/netfilter_ipv6/ip6t_esp.h | 12 +-- net/ipv4/netfilter/Kconfig | 8 +- net/ipv4/netfilter/Makefile | 2 net/ipv4/netfilter/ipt_esp.c | 111 ------------------------- net/ipv6/netfilter/Kconfig | 6 + net/ipv6/netfilter/Makefile | 2 net/ipv6/netfilter/ip6t_esp.c | 115 -------------------------- net/netfilter/Kconfig | 9 ++ net/netfilter/Makefile | 1 net/netfilter/xt_esp.c | 136 +++++++++++++++++++++++++++++++ 12 files changed, 177 insertions(+), 253 deletions(-)
include/linux/netfilter/xt_esp.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef _XT_ESP_H +#define _XT_ESP_H + +struct xt_esp +{ +u_int32_t spis[2 ];/* Security Parameter Index */ +u_int8_t invflags;/* Inverse flags */ +}; + +/* Values for "invflags" field in struct xt_esp. */ +#define XT_ESP_INV_SPI 0x01/* Invert the sense of spi. */ +#define XT_ESP_INV_MASK 0x01/* All possible flags. */ + +#endif /*_XT_ESP_H*/
include/linux/netfilter_ipv4/ipt_esp.h +4 -10
@@ -1,16 +1,10 @@#ifndef _IPT_ESP_H#define _IPT_ESP_H -struct ipt_esp -{ -u_int32_t spis[2 ];/* Security Parameter Index */ -u_int8_t invflags;/* Inverse flags */ -}; +#include <linux/netfilter/xt_esp.h> - - -/* Values for "invflags" field in struct ipt_esp. */ -#define IPT_ESP_INV_SPI 0x01/* Invert the sense of spi. */ -#define IPT_ESP_INV_MASK 0x01/* All possible flags. */ +#define ipt_esp xt_esp +#define IPT_ESP_INV_SPI XT_ESP_INV_SPI +#define IPT_ESP_INV_MASK XT_ESP_INV_MASK#endif /*_IPT_ESP_H*/
include/linux/netfilter_ipv6/ip6t_esp.h +4 -8
@@ -1,14 +1,10 @@#ifndef _IP6T_ESP_H#define _IP6T_ESP_H -struct ip6t_esp -{ -u_int32_t spis[2 ];/* Security Parameter Index */ -u_int8_t invflags;/* Inverse flags */ -}; +#include <linux/netfilter/xt_esp.h> -/* Values for "invflags" field in struct ip6t_esp. */ -#define IP6T_ESP_INV_SPI 0x01/* Invert the sense of spi. */ -#define IP6T_ESP_INV_MASK 0x01/* All possible flags. */ +#define ip6t_esp xt_esp +#define IP6T_ESP_INV_SPI XT_ESP_INV_SPI +#define IP6T_ESP_INV_MASK XT_ESP_INV_MASK#endif /*_IP6T_ESP_H*/
net/ipv4/netfilter/Kconfig +4 -4
@@ -272,12 +272,12 @@ config IP_NF_MATCH_DSCP To compile it as a module, choose M here. If unsure, say N. -config IP_NF_MATCH_AH_ESP - tristate "AH/ESP match support" +config IP_NF_MATCH_AH + tristate "AH match support" depends on IP_NF_IPTABLES help - These two match extensions (`ah' and `esp') allow you to match a - range of SPIs inside AH or ESP headers of IPSec packets. + This match extension allows you to match a range of SPIs + inside AH header of IPSec packets. To compile it as a module, choose M here. If unsure, say N.
net/ipv4/netfilter/Makefile +1 -1
@@ -59,7 +59,7 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_DSCP) += ipt_dscp.o -obj-$(CONFIG_IP_NF_MATCH_AH_ESP) += ipt_ah.o ipt_esp.o +obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
net/ipv4/netfilter/ipt_esp.c deleted +0 -111
111 lines not on this page · raw message
net/ipv6/netfilter/Kconfig +3 -3
@@ -115,11 +115,11 @@ config IP6_NF_MATCH_IPV6HEADER To compile it as a module, choose M here. If unsure, say N. -config IP6_NF_MATCH_AHESP - tristate "AH/ESP match support" +config IP6_NF_MATCH_AH + tristate "AH match support" depends on IP6_NF_IPTABLES help - This module allows one to match AH and ESP packets. + This module allows one to match AH packets. To compile it as a module, choose M here. If unsure, say N.
net/ipv6/netfilter/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o ip6t_dst.o obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o -obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o +obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
net/ipv6/netfilter/ip6t_esp.c deleted +0 -115
115 lines not on this page · raw message
net/netfilter/Kconfig +9 -0
@@ -231,6 +231,15 @@ config NETFILTER_XT_MATCH_DCCP If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. +config NETFILTER_XT_MATCH_ESP + tristate '"ESP" match support' + depends on NETFILTER_XTABLES + help + This match extension allows you to match a range of SPIs + inside ESP header of IPSec packets. + + To compile it as a module, choose M here. If unsure, say N. + config NETFILTER_XT_MATCH_HELPER tristate '"helper" match support' depends on NETFILTER_XTABLES
net/netfilter/Makefile +1 -0
@@ -35,6 +35,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTE obj-$(CONFIG_NETFILTER_XT_MATCH_CONNMARK) += xt_connmark.o obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o +obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += xt_limit.o
net/netfilter/xt_esp.c new file +136 -0
136 lines not on this page · raw message
David S. Miller
maintainerFrom: Patrick McHardy <[email protected]>
Date: Fri, 31 Mar 2006 12:28:56 +0200
Quoted 4 lines
Sorry, I accidentally missed the first patch. I've attached it to this mail, with it the patches apply cleanly against the current tree. If you want me to resubmit the entire set anyway please say so. Thanks.
Ok, this is fine.
I already pushed to Linus tonight, so I'll add these in some time tomorrow.
Thanks again.