tproxy: add IPv6 support
Subsystems (5)
v2 cover tproxy: add IPv6 support
The following series adds IPv6 support for tproxy. The parts touching non-Netfilter code include exporting the UDP lookup function, adding the sockopt infrastructure for getting the original destination address and allowing non-local binds if the IP_TRANSPARENT socket option is set.
Netfilter changes are splitting the defragmentation code off of conntrack, adding IPv6 socket lookup helpers to the tproxy core module and updating the socket match and the TPROXY target.
The last patch in the series tries to make it easier to use the TPROXY target by selecting a meaningful address to redirect to in case the user did not explicitly specify it with '--on-ip'.
v2 of the patches incorporates fixes suggested by Jan Engelhardt.
---
Balazs Scheidler (9):
tproxy: split off ipv6 defragmentation to a separate module
tproxy: added const specifiers to udp lookup functions
tproxy: added udp6_lib_lookup function
tproxy: added tproxy sockopt interface in the IPV6 layer
tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
tproxy: added IPv6 socket lookup function to nf_tproxy_core
tproxy: added IPv6 support to the TPROXY target
tproxy: added IPv6 support to the socket match
tproxy: use the interface primary IP address as a default value for --on-ip
include/linux/in6.h | 4 include/linux/ipv6.h | 4 include/linux/netfilter/xt_TPROXY.h | 13 + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 6 include/net/netfilter/nf_tproxy_core.h | 72 +++++ include/net/udp.h | 3 net/ipv6/af_inet6.c | 2 net/ipv6/datagram.c | 19 + net/ipv6/ipv6_sockglue.c | 23 ++ net/ipv6/netfilter/Makefile | 5 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 78 ------ net/ipv6/netfilter/nf_conntrack_reasm.c | 12 + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 131 ++++++++++ net/ipv6/udp.c | 16 + net/netfilter/xt_TPROXY.c | 328 +++++++++++++++++++++--- net/netfilter/xt_socket.c | 165 +++++++++++- 16 files changed, 743 insertions(+), 138 deletions(-) create mode 100644 include/net/netfilter/ipv6/nf_defrag_ipv6.h create mode 100644 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
Signature · 1 line
KOVACS Krisztian
PATCH v2 1/9 tproxy: split off ipv6 defragmentation to a separate module
From: Balazs Scheidler <[email protected]>
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an nf_defrag_ipv6 module, similar to the already existing nf_defrag_ipv4.
--- include/net/netfilter/ipv6/nf_defrag_ipv6.h | 6 + net/ipv6/netfilter/Makefile | 5 + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 78 +------------- net/ipv6/netfilter/nf_conntrack_reasm.c | 12 ++ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 131 ++++++++++++++++++++++++ 5 files changed, 154 insertions(+), 78 deletions(-) create mode 100644 include/net/netfilter/ipv6/nf_defrag_ipv6.h create mode 100644 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
include/net/netfilter/ipv6/nf_defrag_ipv6.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _NF_DEFRAG_IPV6_H +#define _NF_DEFRAG_IPV6_H + +extern void nf_defrag_ipv6_enable (void ); + +#endif /* _NF_DEFRAG_IPV6_H */
net/ipv6/netfilter/Makefile +3 -2
@@ -11,10 +11,11 @@ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o # objects for l3 independent conntrack -nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o nf_conntrack_reasm.o +nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o +nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o # l3 independent conntrack -obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o +obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o # matches obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +3 -75
136 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_reasm.c +11 -1
@@ -73,7 +73,7 @@ static struct inet_frags nf_frags;static struct netns_frags nf_init_frags; #ifdef CONFIG_SYSCTL -struct ctl_table nf_ct_ipv6_sysctl_table[] = { +struct ctl_table nf_ct_frag6_sysctl_table[] = { { .procname = "nf_conntrack_frag6_timeout", .data = &nf_init_frags.timeout,
@@ -97,6 +97,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = { }, { } }; + +static struct ctl_table_header *nf_ct_frag6_sysctl_header;#endif static unsigned int nf_hashfn (struct inet_frag_queue *q)
@@ -623,11 +625,19 @@ int nf_ct_frag6_init(void)inet_frags_init_net (&nf_init_frags);inet_frags_init (&nf_frags); + nf_ct_frag6_sysctl_header =register_sysctl_paths (nf_net_netfilter_sysctl_path, + nf_ct_frag6_sysctl_table); +if (!nf_ct_frag6_sysctl_header) +return -ENOMEM ; +return 0 ; }void nf_ct_frag6_cleanup (void ) { +unregister_sysctl_table (nf_ct_frag6_sysctl_header); + nf_ct_frag6_sysctl_header =NULL ; +inet_frags_fini (&nf_frags); nf_init_frags.low_thresh =0 ;
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c new file +131 -0
131 lines not on this page · raw message
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 23 lines
net/ipv6/netfilter/nf_conntrack_reasm.c +3
-1@@ -73,7 +73,7 @@ static struct inet_frags nf_frags;static struct netns_frags nf_init_frags; #ifdef CONFIG_SYSCTL -struct ctl_table nf_ct_ipv6_sysctl_table[] = { +struct ctl_table nf_ct_frag6_sysctl_table[] = { { .procname = "nf_conntrack_frag6_timeout", .data = &nf_init_frags.timeout,@@ -97,6 +97,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = { }, { } }; + +static struct ctl_table_header *nf_ct_frag6_sysctl_header;#endif static unsigned int nf_hashfn (struct inet_frag_queue *q)
net/ipv6/netfilter/nf_conntrack_reasm.c int nf_ct_frag6_init(void) · line 631
Quoted 7 lines
net/ipv6/netfilter/nf_conntrack_reasm.c +4
-0@@ -623,11 +625,19 @@ int nf_ct_frag6_init(void)inet_frags_init_net (&nf_init_frags);inet_frags_init (&nf_frags); + nf_ct_frag6_sysctl_header =register_sysctl_paths (nf_net_netfilter_sysctl_path, + nf_ct_frag6_sysctl_table); +if (!nf_ct_frag6_sysctl_header) +return -ENOMEM ;
This needs to call inet_frags_fini() on errors since inet_frags_init() starts a timer to recalculate the secret.
Quoted 151 lines
net/ipv6/netfilter/nf_conntrack_reasm.c +4
-0+return 0 ; }void nf_ct_frag6_cleanup (void ) { +unregister_sysctl_table (nf_ct_frag6_sysctl_header); + nf_ct_frag6_sysctl_header =NULL ; +inet_frags_fini (&nf_frags); nf_init_frags.low_thresh =0 ;net/ipv6/netfilter/nf_defrag_ipv6_hooks.c new file +131
-0@@ -0,0 +1,131 @@ +/* (C) 1999-2001 Paul `Rusty' Russell +* (C) 2002-2004 Netfilter Core Team <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/types.h> +#include <linux/ipv6.h> +#include <linux/in6.h> +#include <linux/netfilter.h> +#include <linux/module.h> +#include <linux/skbuff.h> +#include <linux/icmp.h> +#include <linux/sysctl.h> +#include <net/ipv6.h> +#include <net/inet_frag.h> + +#include <linux/netfilter_ipv6.h> +#include <linux/netfilter_bridge.h> +#include <net/netfilter/nf_conntrack.h> +#include <net/netfilter/nf_conntrack_helper.h> +#include <net/netfilter/nf_conntrack_l4proto.h> +#include <net/netfilter/nf_conntrack_l3proto.h> +#include <net/netfilter/nf_conntrack_core.h> +#include <net/netfilter/nf_conntrack_zones.h> +#include <net/netfilter/ipv6/nf_conntrack_ipv6.h> +#include <net/netfilter/ipv6/nf_defrag_ipv6.h> + +static enum ip6_defrag_users nf_ct6_defrag_user (unsigned int hooknum, +struct sk_buff *skb) +{ +u16 zone =NF_CT_DEFAULT_ZONE ; + +if (skb->nfct) + zone =nf_ct_zone ((struct nf_conn *)skb->nfct); + +#ifdef CONFIG_BRIDGE_NETFILTER +if (skb->nf_bridge && + skb->nf_bridge->mask &BRNF_NF_BRIDGE_PREROUTING ) +return IP6_DEFRAG_CONNTRACK_BRIDGE_IN + zone; +#endif +if (hooknum ==NF_INET_PRE_ROUTING ) +return IP6_DEFRAG_CONNTRACK_IN + zone; +else +return IP6_DEFRAG_CONNTRACK_OUT + zone; + +} + +static unsigned int ipv6_defrag (unsigned int hooknum, +struct sk_buff *skb, +const struct net_device *in, +const struct net_device *out, +int (*okfn)(struct sk_buff *)) +{ +struct sk_buff *reasm; + +/* Previously seen (loopback)? */ +if (skb->nfct && !nf_ct_is_template ((struct nf_conn *)skb->nfct)) +return NF_ACCEPT ; + + reasm =nf_ct_frag6_gather (skb,nf_ct6_defrag_user (hooknum, skb)); +/* queued */ +if (reasm ==NULL ) +return NF_STOLEN ; + +/* error occured or not fragmented */ +if (reasm == skb) +return NF_ACCEPT ; + +nf_ct_frag6_output (hooknum, reasm, (struct net_device *)in, + (struct net_device *)out, okfn); + +return NF_STOLEN ; +} + +static struct nf_hook_ops ipv6_defrag_ops[] = { + { + .hook = ipv6_defrag, + .owner =THIS_MODULE , + .pf =NFPROTO_IPV6 , + .hooknum =NF_INET_PRE_ROUTING , + .priority =NF_IP6_PRI_CONNTRACK_DEFRAG , + }, + { + .hook = ipv6_defrag, + .owner =THIS_MODULE , + .pf =NFPROTO_IPV6 , + .hooknum =NF_INET_LOCAL_OUT , + .priority =NF_IP6_PRI_CONNTRACK_DEFRAG , + }, +}; + +static int __init nf_defrag_init (void ) +{ +int ret =0 ; + + ret =nf_ct_frag6_init (); +if (ret <0 ) { +pr_err ("nf_defrag_ipv6: can't initialize frag6.\n" ); +return ret; + } + ret =nf_register_hooks (ipv6_defrag_ops,ARRAY_SIZE (ipv6_defrag_ops)); +if (ret <0 ) { +pr_err ("nf_defrag_ipv6: can't register hooks\n" ); + goto cleanup_frag6; + } +return ret; + +cleanup_frag6: +nf_ct_frag6_cleanup (); +return ret; + +} + +static void __exit nf_defrag_fini(void) +{ +nf_unregister_hooks (ipv6_defrag_ops,ARRAY_SIZE (ipv6_defrag_ops)); +nf_ct_frag6_cleanup (); +} + +void nf_defrag_ipv6_enable (void ) +{ +} +EXPORT_SYMBOL_GPL (nf_defrag_ipv6_enable); + +module_init (nf_defrag_init); +module_exit (nf_defrag_fini); + +MODULE_LICENSE ("GPL" );
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Quoted 4 lines · Patrick McHardy
Quoted 4 lines
(quoted diff) +0
-0@@ -623,11 +625,19 @@ int nf_ct_frag6_init(void) inet_frags_init_net(&nf_init_frags); inet_frags_init(&nf_frags);
Quoted 8 lines
Review int nf_ct_frag6_init(void) · line 631
Quoted 4 lines
(quoted diff) +4
-0+ nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path, + nf_ct_frag6_sysctl_table); + if (!nf_ct_frag6_sysctl_header) + return -ENOMEM;This needs to call
inet_frags_fini()on errors sinceinet_frags_init()starts a timer to recalculate the secret.
That's a good catch, should be fixed in the patch below. Thanks Patrick!
commit 7e9c541b2d6129757a250b8be21b46d4f84d628d
Author: Balazs Scheidler <[email protected]> Date: Tue Oct 19 01:16:21 2010 +0200
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an nf_defrag_ipv6 module, similar to the already existing nf_defrag_ipv4.
include/net/netfilter/ipv6/nf_defrag_ipv6.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _NF_DEFRAG_IPV6_H +#define _NF_DEFRAG_IPV6_H + +extern void nf_defrag_ipv6_enable (void ); + +#endif /* _NF_DEFRAG_IPV6_H */
net/ipv6/netfilter/Makefile +3 -2
@@ -11,10 +11,11 @@ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o # objects for l3 independent conntrack -nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o nf_conntrack_reasm.o +nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o +nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o # l3 independent conntrack -obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o +obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o # matches obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +3 -75
136 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_reasm.c +13 -1
@@ -73,7 +73,7 @@ static struct inet_frags nf_frags;static struct netns_frags nf_init_frags; #ifdef CONFIG_SYSCTL -struct ctl_table nf_ct_ipv6_sysctl_table[] = { +struct ctl_table nf_ct_frag6_sysctl_table[] = { { .procname = "nf_conntrack_frag6_timeout", .data = &nf_init_frags.timeout,
@@ -97,6 +97,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = { }, { } }; + +static struct ctl_table_header *nf_ct_frag6_sysctl_header;#endif static unsigned int nf_hashfn (struct inet_frag_queue *q)
@@ -623,11 +625,21 @@ int nf_ct_frag6_init(void)inet_frags_init_net (&nf_init_frags);inet_frags_init (&nf_frags); + nf_ct_frag6_sysctl_header =register_sysctl_paths (nf_net_netfilter_sysctl_path, + nf_ct_frag6_sysctl_table); +if (!nf_ct_frag6_sysctl_header) { +inet_frags_fini (&nf_frags); +return -ENOMEM ; + } +return 0 ; }void nf_ct_frag6_cleanup (void ) { +unregister_sysctl_table (nf_ct_frag6_sysctl_header); + nf_ct_frag6_sysctl_header =NULL ; +inet_frags_fini (&nf_frags); nf_init_frags.low_thresh =0 ;
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c new file +131 -0
131 lines not on this page · raw message
Patrick McHardy
AppliedRe: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Am 21.10.2010 13:43, schrieb KOVACS Krisztian:
Quoted 6 lines
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an
nf_defrag_ipv6module, similar to the already existingnf_defrag_ipv4.
Applied, thanks.
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Quoted 9 lines · Patrick McHardy
Am 21.10.2010 13:43, schrieb KOVACS Krisztian:
Quoted 6 lines
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an
nf_defrag_ipv6module, similar to the already existingnf_defrag_ipv4.Applied, thanks.
Hmm...
CONFIG_IPV6=mCONFIG_NETFILTER_TPROXY=m
MODPOST 201 modules
ERROR: "nf_defrag_ipv6_enable" [net/netfilter/xt_TPROXY.ko] undefined!
ERROR: "ipv6_find_hdr" [net/netfilter/xt_TPROXY.ko] undefined!
Sorry, it's late here, I wont fix this ;)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Hi,
Quoted 17 lines · Eric Dumazet
Quoted 9 lines · Patrick McHardy
Am 21.10.2010 13:43, schrieb KOVACS Krisztian:
Quoted 6 lines
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an
nf_defrag_ipv6module, similar to the already existingnf_defrag_ipv4.Applied, thanks.
Hmm...
CONFIG_IPV6=mCONFIG_NETFILTER_TPROXY=m
Quoted 5 lines
MODPOST 201 modules
ERROR: "nf_defrag_ipv6_enable" [net/netfilter/xt_TPROXY.ko] undefined!
ERROR: "ipv6_find_hdr" [net/netfilter/xt_TPROXY.ko] undefined!Sorry, it's late here, I wont fix this ;)
Oops, I guess this is because you do have IPv6 support but don't have ip6tables enabled in your config. Does the patch below fix the issue for you? (For me it now compiles with and without IPv6 conntrack, ip6tables and IPv6 support, too.)
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY
One of the previous tproxy related patches split IPv6 defragmentation and connection tracking, but did not correctly add Kconfig stanzas to handle the new dependencies correctly. This patch fixes that by making the config options mirror the setup we have for IPv4: a distinct config option for defragmentation that is automatically selected by both connection tracking and xt_TPROXY/xt_socket.
The patch also changes the #ifdefs enclosing IPv6 specific code in xt_socket and xt_TPROXY: we only compile these in case we have ip6tables support enabled.
--- net/ipv6/netfilter/Kconfig | 5 +++++ net/ipv6/netfilter/Makefile | 5 ++++- net/netfilter/Kconfig | 2 ++ net/netfilter/xt_TPROXY.c | 10 ++++++---- net/netfilter/xt_socket.c | 12 ++++++++---- 5 files changed, 25 insertions(+), 9 deletions(-)
net/ipv6/netfilter/Kconfig +5 -0
@@ -5,10 +5,15 @@ menu "IPv6: Netfilter Configuration" depends on INET && IPV6 && NETFILTER +config NF_DEFRAG_IPV6 + tristate + default n + config NF_CONNTRACK_IPV6 tristate "IPv6 connection tracking support" depends on INET && IPV6 && NF_CONNTRACK default m if NETFILTER_ADVANCED=n + select NF_DEFRAG_IPV6 ---help--- Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related
net/ipv6/netfilter/Makefile +4 -1
@@ -12,11 +12,14 @@ obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o # objects for l3 independent conntrack nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o -nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o # l3 independent conntrack obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o +# defrag +nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o +obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o + # matches obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o
net/netfilter/Kconfig +2 -0
@@ -525,6 +525,7 @@ config NETFILTER_XT_TARGET_TPROXY depends on NETFILTER_XTABLES depends on NETFILTER_ADVANCED select NF_DEFRAG_IPV4 + select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES help This option adds a `TPROXY' target, which is somewhat similar to REDIRECT. It can only be used in the mangle table and is useful
@@ -927,6 +928,7 @@ config NETFILTER_XT_MATCH_SOCKET depends on NETFILTER_ADVANCED depends on !NF_CONNTRACK || NF_CONNTRACK select NF_DEFRAG_IPV4 + select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES help This option adds a `socket' match, which can be used to match packets for which a TCP or UDP socket lookup finds a valid socket.
net/netfilter/xt_TPROXY.c +6 -4
@@ -21,7 +21,9 @@#include <linux/netfilter_ipv4/ip_tables.h> #include <net/netfilter/ipv4/nf_defrag_ipv4.h> -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) + +#if defined(CONFIG_IP6_NF_IPTABLES ) || defined(CONFIG_IP6_NF_IPTABLES_MODULE ) +#define XT_TPROXY_HAVE_IPV6 1#include <net/if_inet6.h> #include <net/addrconf.h> #include <linux/netfilter_ipv6/ip6_tables.h>
@@ -172,7 +174,7 @@ tproxy_tg4_v1(struct sk_buff *skb, const struct xt_action_param *par)return tproxy_tg4 (skb, tgi->laddr.ip, tgi->lport, tgi->mark_mask, tgi->mark_value); } -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_TPROXY_HAVE_IPV6 static inline const struct in6_addr * tproxy_laddr6(struct sk_buff *skb, const struct in6_addr *user_laddr,
@@ -372,7 +374,7 @@ static struct xt_target tproxy_tg_reg[] __read_mostly = { .hooks = 1 << NF_INET_PRE_ROUTING, .me = THIS_MODULE, }, -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_TPROXY_HAVE_IPV6 { .name = "TPROXY", .family = NFPROTO_IPV6,
@@ -391,7 +393,7 @@ static struct xt_target tproxy_tg_reg[] __read_mostly = {static int __init tproxy_tg_init (void ) {nf_defrag_ipv4_enable (); -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_TPROXY_HAVE_IPV6 nf_defrag_ipv6_enable ();#endif
net/netfilter/xt_socket.c +8 -4
@@ -14,7 +14,6 @@#include <linux/skbuff.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> #include <net/tcp.h> #include <net/udp.h> #include <net/icmp.h>
@@ -22,7 +21,12 @@#include <net/inet_sock.h> #include <net/netfilter/nf_tproxy_core.h> #include <net/netfilter/ipv4/nf_defrag_ipv4.h> + +#if defined(CONFIG_IP6_NF_IPTABLES ) || defined(CONFIG_IP6_NF_IPTABLES_MODULE ) +#define XT_SOCKET_HAVE_IPV6 1 +#include <linux/netfilter_ipv6/ip6_tables.h> #include <net/netfilter/ipv6/nf_defrag_ipv6.h> +#endif #include <linux/netfilter/xt_socket.h>
@@ -186,7 +190,7 @@ socket_mt4_v1(const struct sk_buff *skb, struct xt_action_param *par)return socket_match (skb, par, par->matchinfo); } -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_SOCKET_HAVE_IPV6 static int extract_icmp6_fields(const struct sk_buff *skb,
@@ -331,7 +335,7 @@ static struct xt_match socket_mt_reg[] __read_mostly = { (1 << NF_INET_LOCAL_IN), .me = THIS_MODULE, }, -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_SOCKET_HAVE_IPV6 { .name = "socket", .revision = 1,
@@ -348,7 +352,7 @@ static struct xt_match socket_mt_reg[] __read_mostly = {static int __init socket_mt_init (void ) {nf_defrag_ipv4_enable (); -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#ifdef XT_SOCKET_HAVE_IPV6 nf_defrag_ipv6_enable ();#endif
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Quoted 24 lines · KOVACS Krisztian
Hi,
Quoted 21 lines · Eric Dumazet
Quoted 9 lines · Patrick McHardy
Am 21.10.2010 13:43, schrieb KOVACS Krisztian:
Quoted 6 lines
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an
nf_defrag_ipv6module, similar to the already existingnf_defrag_ipv4.Applied, thanks.
Hmm...
CONFIG_IPV6=mCONFIG_NETFILTER_TPROXY=mMODPOST 201 modules
ERROR: "nf_defrag_ipv6_enable" [net/netfilter/xt_TPROXY.ko] undefined!
ERROR: "ipv6_find_hdr" [net/netfilter/xt_TPROXY.ko] undefined!
Quoted 8 lines
Quoted 1 line
Sorry, it's late here, I wont fix this ;)
Oops, I guess this is because you do have IPv6 support but don't have ip6tables enabled in your config. Does the patch below fix the issue for you? (For me it now compiles with and without IPv6 conntrack, ip6tables and IPv6 support, too.)
I had ip6tables enabled, but not CONFIG_NF_CONNTRACK_IPV6 ;)
Quoted 10 lines
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and
xt_TPROXYOne of the previous tproxy related patches split IPv6 defragmentation and connection tracking, but did not correctly add
Kconfigstanzas to handle the new dependencies correctly. This patch fixes that by making the config options mirror the setup we have for IPv4: a distinct config option for defragmentation that is automatically selected by both connection tracking and xt_TPROXY/xt_socket.
Quoted 4 lines
The patch also changes the #ifdefs enclosing IPv6 specific code in
xt_socketandxt_TPROXY: we only compile these in case we have ip6tables support enabled.Signed-off-by KOVACS Krisztian <[email protected]>
Thanks !
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
Am 25.10.2010 12:14, schrieb Eric Dumazet:
Quoted 46 lines · KOVACS Krisztian
Quoted 24 lines
Hi,
Quoted 21 lines · Eric Dumazet
Quoted 9 lines · Patrick McHardy
Am 21.10.2010 13:43, schrieb KOVACS Krisztian:
Quoted 6 lines
tproxy: split off ipv6 defragmentation to a separate module
Like with IPv4, TProxy needs IPv6 defragmentation but does not require connection tracking. Since defragmentation was coupled with conntrack, I split off the two, creating an
nf_defrag_ipv6module, similar to the already existingnf_defrag_ipv4.Applied, thanks.
Hmm...
CONFIG_IPV6=mCONFIG_NETFILTER_TPROXY=mMODPOST 201 modules
ERROR: "nf_defrag_ipv6_enable" [net/netfilter/xt_TPROXY.ko] undefined!
ERROR: "ipv6_find_hdr" [net/netfilter/xt_TPROXY.ko] undefined!Quoted 8 lines
Quoted 1 line
Sorry, it's late here, I wont fix this ;)
Oops, I guess this is because you do have IPv6 support but don't have ip6tables enabled in your config. Does the patch below fix the issue for you? (For me it now compiles with and without IPv6 conntrack, ip6tables and IPv6 support, too.)
I had ip6tables enabled, but not
CONFIG_NF_CONNTRACK_IPV6;)Quoted 10 lines
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and
xt_TPROXYOne of the previous tproxy related patches split IPv6 defragmentation and connection tracking, but did not correctly add
Kconfigstanzas to handle the new dependencies correctly. This patch fixes that by making the config options mirror the setup we have for IPv4: a distinct config option for defragmentation that is automatically selected by both connection tracking and xt_TPROXY/xt_socket.
Quoted 6 lines
Quoted 4 lines
The patch also changes the #ifdefs enclosing IPv6 specific code in
xt_socketandxt_TPROXY: we only compile these in case we have ip6tables support enabled.Signed-off-by KOVACS Krisztian <[email protected]>Reported-and-tested-by Eric Dumazet <[email protected]>
Dave, please apply directly. Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerRe: [PATCH v2 1/9] tproxy: split off ipv6 defragmentation to a separate module
From: Patrick McHardy <[email protected]>
Date: Mon, 25 Oct 2010 22:42:48 +0200
Quoted 10 lines
Am 25.10.2010 12:14, schrieb Eric Dumazet:
Quoted 9 lines
Quoted 9 lines
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and
xt_TPROXYOne of the previous tproxy related patches split IPv6 defragmentation and connection tracking, but did not correctly add
Kconfigstanzas to handle the new dependencies correctly. This patch fixes that by making the config options mirror the setup we have for IPv4: a distinct config option for defragmentation that is automatically selected by both connection tracking and xt_TPROXY/xt_socket.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
The patch also changes the #ifdefs enclosing IPv6 specific code in
xt_socketandxt_TPROXY: we only compile these in case we have ip6tables support enabled.Signed-off-by KOVACS Krisztian <[email protected]>Reported-and-tested-by Eric Dumazet <[email protected]>Dave, please apply directly. Thanks!
Will do, thanks Patrick!
PATCH v2 2/9 tproxy: added const specifiers to udp lookup functions
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
The parameters for various UDP lookup functions were non-const, even though they could be const. TProxy has some const references and instead of downcasting it, I added const specifiers along the path.
--- net/ipv6/udp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
net/ipv6/udp.c +4 -4
@@ -122,8 +122,8 @@ static void udp_v6_rehash(struct sock *sk)static inline int compute_score (struct sock *sk,struct net *net,unsigned short hnum, -struct in6_addr *saddr,__be16 sport, -struct in6_addr *daddr,__be16 dport, +const struct in6_addr *saddr,__be16 sport, +const struct in6_addr *daddr,__be16 dport,int dif) {int score =-1 ;
@@ -239,8 +239,8 @@ exact_match: }static struct sock *__udp6_lib_lookup (struct net *net, -struct in6_addr *saddr,__be16 sport, -struct in6_addr *daddr,__be16 dport, +const struct in6_addr *saddr,__be16 sport, +const struct in6_addr *daddr,__be16 dport,int dif,struct udp_table *udptable) {struct sock *sk, *result;
Patrick McHardy
AppliedRe: [PATCH v2 2/9] tproxy: added const specifiers to udp lookup functions
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 3 lines
The parameters for various UDP lookup functions were non-const, even though they could be const. TProxy has some const references and instead of downcasting it, I added const specifiers along the path.
Applied, thanks.
PATCH v2 3/9 tproxy: added udp6_lib_lookup function
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
Just like with IPv4, we need access to the UDP hash table to look up local sockets, but instead of exporting the global udp_table, export a lookup function.
--- include/net/udp.h | 3 +++ net/ipv6/udp.c | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)
include/net/udp.h +3 -0
@@ -183,6 +183,9 @@ extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,extern struct sock *udp4_lib_lookup (struct net *net,__be32 saddr,__be16 sport,__be32 daddr,__be16 dport,int dif); +extern struct sock *udp6_lib_lookup (struct net *net,const struct in6_addr *saddr,__be16 sport, +const struct in6_addr *daddr,__be16 dport, +int dif);/* * SNMP statistics for UDP and UDP-Lite
net/ipv6/udp.c +8 -0
@@ -320,6 +320,14 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb, udptable); } +struct sock *udp6_lib_lookup (struct net *net,const struct in6_addr *saddr,__be16 sport, +const struct in6_addr *daddr,__be16 dport,int dif) +{ +return __udp6_lib_lookup (net, saddr, sport, daddr, dport, dif, &udp_table); +} +EXPORT_SYMBOL_GPL (udp6_lib_lookup); + +/* * This should be easy, if there is something there we * return it, otherwise we block.
Patrick McHardy
AppliedRe: [PATCH v2 3/9] tproxy: added udp6_lib_lookup function
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 3 lines
Just like with IPv4, we need access to the UDP hash table to look up local sockets, but instead of exporting the global
udp_table, export a lookup function.
Applied, thanks.
PATCH v2 4/9 tproxy: added tproxy sockopt interface in the IPV6 layer
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
Support for IPV6_RECVORIGDSTADDR sockopt for UDP sockets were contributed by Harry Mason.
--- include/linux/in6.h | 4 ++++ include/linux/ipv6.h | 4 +++- net/ipv6/datagram.c | 19 +++++++++++++++++++ net/ipv6/ipv6_sockglue.c | 23 +++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletions(-)
include/linux/in6.h +4 -0
@@ -268,6 +268,10 @@ struct in6_flowlabel_req {/* RFC5082: Generalized Ttl Security Mechanism */ #define IPV6_MINHOPCOUNT 73 +#define IPV6_ORIGDSTADDR 74 +#define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR +#define IPV6_TRANSPARENT 75 +/* * Multicast Routing: * see include/linux/mroute6.h.
include/linux/ipv6.h +3 -1
@@ -341,7 +341,9 @@ struct ipv6_pinfo { odstopts:1, rxflow:1, rxtclass:1, - rxpmtu:1; + rxpmtu:1, + rxorigdstaddr:1; +/* 2 bits hole */ } bits;__u16 all; } rxopt;
net/ipv6/datagram.c +19 -0
@@ -577,6 +577,25 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)u8 *ptr = nh + opt->dst1;put_cmsg (msg,SOL_IPV6 ,IPV6_2292DSTOPTS , (ptr[1 ]+1 )<<3 , ptr); } +if (np->rxopt.bits.rxorigdstaddr) { +struct sockaddr_in6 sin6; +u16 *ports = (u16 *)skb_transport_header (skb); + +if (skb_transport_offset (skb) +4 <= skb->len) { +/* All current transport protocols have the port numbers in the +* first four bytes of the transport header and this function is +* written with this assumption in mind. +*/ + + sin6.sin6_family =AF_INET6 ; +ipv6_addr_copy (&sin6.sin6_addr, &ipv6_hdr (skb)->daddr); + sin6.sin6_port = ports[1 ]; + sin6.sin6_flowinfo =0 ; + sin6.sin6_scope_id =0 ; + +put_cmsg (msg,SOL_IPV6 ,IPV6_ORIGDSTADDR ,sizeof (sin6), &sin6); + } + }return 0 ; }
net/ipv6/ipv6_sockglue.c +23 -0
@@ -342,6 +342,21 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, retv =0 ;break ; +case IPV6_TRANSPARENT : +if (optlen <sizeof (int )) + goto e_inval; +/* we don't have a separate transparent bit for IPV6 we use the one in the IPv4 socket */ +inet_sk (sk)->transparent = valbool; + retv =0 ; +break ; + +case IPV6_RECVORIGDSTADDR : +if (optlen <sizeof (int )) + goto e_inval; + np->rxopt.bits.rxorigdstaddr = valbool; + retv =0 ; +break ; +case IPV6_HOPOPTS :case IPV6_RTHDRDSTOPTS :case IPV6_RTHDR :
@@ -1104,6 +1119,14 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,break ; } +case IPV6_TRANSPARENT : + val =inet_sk (sk)->transparent; +break ; + +case IPV6_RECVORIGDSTADDR : + val = np->rxopt.bits.rxorigdstaddr; +break ; +case IPV6_UNICAST_HOPS :case IPV6_MULTICAST_HOPS : {
Patrick McHardy
AppliedRe: [PATCH v2 4/9] tproxy: added tproxy sockopt interface in the IPV6 layer
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 2 lines
Support for
IPV6_RECVORIGDSTADDRsockopt for UDP sockets were contributed by Harry Mason.
Applied, thanks.
PATCH v2 5/9 tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
--- net/ipv6/af_inet6.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/ipv6/af_inet6.c +1 -1
@@ -343,7 +343,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)*/ v4addr =LOOPBACK4_IPV6 ;if (!(addr_type &IPV6_ADDR_MULTICAST )) { -if (!ipv6_chk_addr (net, &addr->sin6_addr, +if (!inet->transparent && !ipv6_chk_addr (net, &addr->sin6_addr, dev,0 )) { err = -EADDRNOTAVAIL ; goto out_unlock;
Re: [PATCH v2 5/9] tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
net/ipv6/af_inet6.c int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) · line 347
Quoted 7 lines
net/ipv6/af_inet6.c +1
-1@@ -343,7 +343,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)*/ v4addr =LOOPBACK4_IPV6 ;if (!(addr_type &IPV6_ADDR_MULTICAST )) { -if (!ipv6_chk_addr (net, &addr->sin6_addr, +if (!inet->transparent && !ipv6_chk_addr (net, &addr->sin6_addr, dev,0 )) {
This looked like it was supposed to have a line break at the &&, so I've added that and applied it.
PATCH v2 6/9 tproxy: added IPv6 socket lookup function to nf_tproxy_core
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
--- include/net/netfilter/nf_tproxy_core.h | 72 ++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 1 deletions(-)
include/net/netfilter/nf_tproxy_core.h +71 -1
@@ -5,7 +5,8 @@#include <linux/in.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/inet_sock.h> +#include <net/inet_hashtables.h> +#include <net/inet6_hashtables.h> #include <net/tcp.h> #define NFT_LOOKUP_ANY 0
@@ -130,6 +131,75 @@ nf_tproxy_get_sock_v4(struct net *net, const u8 protocol,return sk; } +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +static inline struct sock * +nf_tproxy_get_sock_v6 (struct net *net,const u8 protocol, +const struct in6_addr *saddr,const struct in6_addr *daddr, +const __be16 sport,const __be16 dport, +const struct net_device *in,int lookup_type) +{ +struct sock *sk; + +/* look up socket */ +switch (protocol) { +case IPPROTO_TCP : +switch (lookup_type) { +case NFT_LOOKUP_ANY : + sk =inet6_lookup (net, &tcp_hashinfo, + saddr, sport, daddr, dport, + in->ifindex); +break ; +case NFT_LOOKUP_LISTENER : + sk =inet6_lookup_listener (net, &tcp_hashinfo, + daddr,ntohs (dport), + in->ifindex); + +/* NOTE: we return listeners even if bound to +* 0.0.0.0, those are filtered out in +* xt_socket, since xt_TPROXY needs 0 bound +* listeners too */ + +break ; +case NFT_LOOKUP_ESTABLISHED : + sk =__inet6_lookup_established (net, &tcp_hashinfo, + saddr, sport, daddr,ntohs (dport), + in->ifindex); +break ; +default : +WARN_ON (1 ); + sk =NULL ; +break ; + } +break ; +case IPPROTO_UDP : + sk =udp6_lib_lookup (net, saddr, sport, daddr, dport, + in->ifindex); +if (sk && lookup_type !=NFT_LOOKUP_ANY ) { +int connected = (sk->sk_state ==TCP_ESTABLISHED ); +int wildcard =ipv6_addr_any (&inet6_sk (sk)->rcv_saddr); + +/* NOTE: we return listeners even if bound to +* 0.0.0.0, those are filtered out in +* xt_socket, since xt_TPROXY needs 0 bound +* listeners too */ +if ((lookup_type ==NFT_LOOKUP_ESTABLISHED && (!connected || wildcard)) || + (lookup_type ==NFT_LOOKUP_LISTENER && connected)) { +sock_put (sk); + sk =NULL ; + } + } +break ; +default : +WARN_ON (1 ); + sk =NULL ; + } + +pr_debug ("tproxy socket lookup: proto %u %pI6:%u -> %pI6:%u, lookup type: %d, sock %p\n" , + protocol, saddr,ntohs (sport), daddr,ntohs (dport), lookup_type, sk); + +return sk; +} +#endif static inline void nf_tproxy_put_sock (struct sock *sk)
Patrick McHardy
AppliedRe: [PATCH v2 6/9] tproxy: added IPv6 socket lookup function to nf_tproxy_core
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 2 lines
Signed-off-by Balazs Scheidler <[email protected]>Signed-off-by KOVACS Krisztian <[email protected]>
Applied, thanks.
PATCH v2 7/9 tproxy: added IPv6 support to the TPROXY target
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
This requires a new revision as the old target structure was IPv4 specific.
--- include/linux/netfilter/xt_TPROXY.h | 13 +- net/netfilter/xt_TPROXY.c | 262 ++++++++++++++++++++++++++++++----- 2 files changed, 235 insertions(+), 40 deletions(-)
include/linux/netfilter/xt_TPROXY.h +10 -3
@@ -1,5 +1,5 @@ -#ifndef _XT_TPROXY_H_target -#define _XT_TPROXY_H_target +#ifndef _XT_TPROXY_H +#define _XT_TPROXY_H/* TPROXY target is capable of marking the packet to perform * redirection. We can get rid of that whenever we get support for
@@ -11,4 +11,11 @@ struct xt_tproxy_target_info { __be16 lport; }; -#endif /* _XT_TPROXY_H_target */ +struct xt_tproxy_target_info_v1 { +u_int32_t mark_mask; +u_int32_t mark_value; +union nf_inet_addr laddr; +__be16 lport; +}; + +#endif /* _XT_TPROXY_H */
net/netfilter/xt_TPROXY.c +225 -37
354 lines not on this page · raw message
Patrick McHardy
AppliedRe: [PATCH v2 7/9] tproxy: added IPv6 support to the TPROXY target
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 2 lines
This requires a new revision as the old target structure was IPv4 specific.
Applied, thanks.
PATCH v2 8/9 tproxy: added IPv6 support to the socket match
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
The ICMP extraction bits were contributed by Harry Mason.
--- net/netfilter/xt_socket.c | 165 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 154 insertions(+), 11 deletions(-)
net/netfilter/xt_socket.c +154 -11
@@ -14,6 +14,7 @@#include <linux/skbuff.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter_ipv6/ip6_tables.h> #include <net/tcp.h> #include <net/udp.h> #include <net/icmp.h>
@@ -21,6 +22,7 @@#include <net/inet_sock.h> #include <net/netfilter/nf_tproxy_core.h> #include <net/netfilter/ipv4/nf_defrag_ipv4.h> +#include <net/netfilter/ipv6/nf_defrag_ipv6.h> #include <linux/netfilter/xt_socket.h>
@@ -30,7 +32,7 @@#endif static int -extract_icmp_fields(const struct sk_buff *skb, +extract_icmp4_fields(const struct sk_buff *skb, u8 *protocol, __be32 *raddr, __be32 *laddr,
@@ -86,7 +88,6 @@ extract_icmp_fields(const struct sk_buff *skb,return 0 ; } -static bool socket_match (const struct sk_buff *skb,struct xt_action_param *par,const struct xt_socket_mtinfo1 *info)
@@ -115,7 +116,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, dport = hp->dest; }else if (iph->protocol ==IPPROTO_ICMP ) { -if (extract_icmp_fields (skb, &protocol, &saddr, &daddr, +if (extract_icmp4_fields (skb, &protocol, &saddr, &daddr, &sport, &dport))return false; }else {
@@ -165,32 +166,157 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, sk =NULL ; } -pr_debug ("proto %u %08x:%u -> %08x:%u (orig %08x:%u) sock %p\n" , - protocol,ntohl (saddr),ntohs (sport), -ntohl (daddr),ntohs (dport), -ntohl (iph->daddr), hp ?ntohs (hp->dest) :0 , sk); +pr_debug ("proto %hhu %pI4:%hu -> %pI4:%hu (orig %pI4:%hu) sock %p\n" , + protocol, &saddr,ntohs (sport), + &daddr,ntohs (dport), + &iph->daddr, hp ?ntohs (hp->dest) :0 , sk);return (sk !=NULL ); }static bool -socket_mt_v0 (const struct sk_buff *skb,struct xt_action_param *par) +socket_mt4_v0 (const struct sk_buff *skb,struct xt_action_param *par) {return socket_match (skb, par,NULL ); }static bool -socket_mt_v1 (const struct sk_buff *skb,struct xt_action_param *par) +socket_mt4_v1 (const struct sk_buff *skb,struct xt_action_param *par) {return socket_match (skb, par, par->matchinfo); } +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) + +static int +extract_icmp6_fields (const struct sk_buff *skb, +unsigned int outside_hdrlen, +u8 *protocol, +struct in6_addr **raddr, +struct in6_addr **laddr, +__be16 *rport, +__be16 *lport) +{ +struct ipv6hdr *inside_iph, _inside_iph; +struct icmp6hdr *icmph, _icmph; +__be16 *ports, _ports[2 ]; +u8 inside_nexthdr; +int inside_hdrlen; + + icmph =skb_header_pointer (skb, outside_hdrlen, +sizeof (_icmph), &_icmph); +if (icmph ==NULL ) +return 1 ; + +if (icmph->icmp6_type &ICMPV6_INFOMSG_MASK ) +return 1 ; + + inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph),sizeof (_inside_iph), &_inside_iph); +if (inside_iph ==NULL ) +return 1 ; + inside_nexthdr = inside_iph->nexthdr; + + inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) +sizeof (_inside_iph), &inside_nexthdr); +if (inside_hdrlen <0 ) +return 1 ;/* hjm: Packet has no/incomplete transport layer headers. */ + +if (inside_nexthdr !=IPPROTO_TCP && + inside_nexthdr !=IPPROTO_UDP ) +return 1 ; + + ports =skb_header_pointer (skb, inside_hdrlen, +sizeof (_ports), &_ports); +if (ports ==NULL ) +return 1 ; + +/* the inside IP packet is the one quoted from our side, thus +* its saddr is the local address */ + *protocol = inside_nexthdr; + *laddr = &inside_iph->saddr; + *lport = ports[0 ]; + *raddr = &inside_iph->daddr; + *rport = ports[1 ]; + +return 0 ; +} + +static bool +socket_mt6_v1 (const struct sk_buff *skb,struct xt_action_param *par) +{ +struct ipv6hdr *iph =ipv6_hdr (skb); +struct udphdr _hdr, *hp =NULL ; +struct sock *sk; +struct in6_addr *daddr, *saddr; +__be16 dport, sport; +int thoff; +u8 tproto; +const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo; + + tproto =ipv6_find_hdr (skb, &thoff,-1 ,NULL ); +if (tproto <0 ) { +pr_debug ("unable to find transport header in IPv6 packet, dropping\n" ); +return NF_DROP ; + } + +if (tproto ==IPPROTO_UDP || tproto ==IPPROTO_TCP ) { + hp =skb_header_pointer (skb, thoff, +sizeof (_hdr), &_hdr); +if (hp ==NULL ) +return false; + + saddr = &iph->saddr; + sport = hp->source; + daddr = &iph->daddr; + dport = hp->dest; + + }else if (tproto ==IPPROTO_ICMPV6 ) { +if (extract_icmp6_fields (skb, thoff, &tproto, &saddr, &daddr, + &sport, &dport)) +return false; + }else { +return false; + } + + sk =nf_tproxy_get_sock_v6 (dev_net (skb->dev), tproto, + saddr, daddr, sport, dport, par->in,NFT_LOOKUP_ANY ); +if (sk !=NULL ) { +bool wildcard; +bool transparent = true; + +/* Ignore sockets listening on INADDR_ANY */ + wildcard = (sk->sk_state !=TCP_TIME_WAIT && +ipv6_addr_any (&inet6_sk (sk)->rcv_saddr)); + +/* Ignore non-transparent sockets, +if XT_SOCKET_TRANSPARENT is used */ +if (info && info->flags &XT_SOCKET_TRANSPARENT ) + transparent = ((sk->sk_state !=TCP_TIME_WAIT && +inet_sk (sk)->transparent) || + (sk->sk_state ==TCP_TIME_WAIT && +inet_twsk (sk)->tw_transparent)); + +nf_tproxy_put_sock (sk); + +if (wildcard || !transparent) + sk =NULL ; + } + +pr_debug ("proto %hhu %pI6:%hu -> %pI6:%hu " +"(orig %pI6:%hu) sock %p\n" , + tproto, saddr,ntohs (sport), + daddr,ntohs (dport), + &iph->daddr, hp ?ntohs (hp->dest) :0 , sk); + +return (sk !=NULL ); +} +#endif +static struct xt_match socket_mt_reg[]__read_mostly = { { .name ="socket" , .revision =0 , .family =NFPROTO_IPV4 , - .match = socket_mt_v0, + .match = socket_mt4_v0, .hooks = (1 <<NF_INET_PRE_ROUTING ) | (1 <<NF_INET_LOCAL_IN ), .me =THIS_MODULE ,
@@ -199,17 +325,33 @@ static struct xt_match socket_mt_reg[] __read_mostly = { .name = "socket", .revision = 1, .family = NFPROTO_IPV4, - .match = socket_mt_v1, + .match = socket_mt4_v1, .matchsize = sizeof(struct xt_socket_mtinfo1), .hooks = (1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN), .me = THIS_MODULE, }, +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) + { + .name = "socket", + .revision = 1, + .family = NFPROTO_IPV6, + .match = socket_mt6_v1, + .matchsize = sizeof(struct xt_socket_mtinfo1), + .hooks = (1 << NF_INET_PRE_ROUTING) | + (1 << NF_INET_LOCAL_IN), + .me = THIS_MODULE, + }, +#endif };static int __init socket_mt_init (void ) {nf_defrag_ipv4_enable (); +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +nf_defrag_ipv6_enable (); +#endif +return xt_register_matches (socket_mt_reg,ARRAY_SIZE (socket_mt_reg)); }
@@ -225,3 +367,4 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Krisztian Kovacs, Balazs Scheidler" );MODULE_DESCRIPTION ("x_tables socket match module" );MODULE_ALIAS ("ipt_socket" ); +MODULE_ALIAS ("ip6t_socket" );
Patrick McHardy
AppliedRe: [PATCH v2 8/9] tproxy: added IPv6 support to the socket match
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 1 line
The ICMP extraction bits were contributed by Harry Mason.
Applied, thanks.
PATCH v2 9/9 tproxy: use the interface primary IP address as a default value for --on-ip
In reply to KOVACS KrisztianFrom: Balazs Scheidler <[email protected]>
The REDIRECT target and the older TProxy versions used the primary address of the incoming interface as the default value of the --on-ip parameter. This was unintentionally changed during the initial TProxy submission and caused confusion among users.
Since IPv6 has no notion of primary address, we just select the first address on the list: this way the socket lookup finds wildcard bound sockets properly and we cannot really do better without the user telling us the IPv6 address of the proxy.
This is implemented for both IPv4 and IPv6.
--- net/netfilter/xt_TPROXY.c | 202 +++++++++++++++++++++++++++++---------------- 1 files changed, 132 insertions(+), 70 deletions(-)
net/netfilter/xt_TPROXY.c +132 -70
@@ -16,15 +16,41 @@#include <net/checksum.h> #include <net/udp.h> #include <net/inet_sock.h> - +#include <linux/inetdevice.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/xt_TPROXY.h> #include <net/netfilter/ipv4/nf_defrag_ipv4.h> +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) +#include <net/if_inet6.h> +#include <net/addrconf.h> +#include <linux/netfilter_ipv6/ip6_tables.h> #include <net/netfilter/ipv6/nf_defrag_ipv6.h> +#endif +#include <net/netfilter/nf_tproxy_core.h> +#include <linux/netfilter/xt_TPROXY.h> + +static inline __be32 +tproxy_laddr4 (struct sk_buff *skb,__be32 user_laddr,__be32 daddr) +{ +struct in_device *indev; +__be32 laddr; + +if (user_laddr) +return user_laddr; + + laddr =0 ; +rcu_read_lock (); + indev =__in_dev_get_rcu (skb->dev); +for_primary_ifa (indev) { + laddr = ifa->ifa_local; +break ; + }endfor_ifa (indev); +rcu_read_unlock (); + +return laddr ? laddr : daddr; +}/** * tproxy_handle_time_wait4() - handle IPv4 TCP TIME_WAIT reopen redirections
@@ -75,60 +101,6 @@ tproxy_handle_time_wait4(struct sk_buff *skb, __be32 laddr, __be16 lport,return sk; } -/** -* tproxy_handle_time_wait6() - handle IPv6 TCP TIME_WAIT reopen redirections -* @skb: The skb being processed. -* @tproto: Transport protocol. -* @thoff: Transport protocol header offset. -* @par: Iptables target parameters. -* @sk: The TIME_WAIT TCP socket found by the lookup. -* -* We have to handle SYN packets arriving to TIME_WAIT sockets -* differently: instead of reopening the connection we should rather -* redirect the new connection to the proxy if there's a listener -* socket present. -* -* tproxy_handle_time_wait6() consumes the socket reference passed in. -* -* Returns the listener socket if there's one, the TIME_WAIT socket if -* no such listener is found, or NULL if the TCP header is incomplete. -*/ -static struct sock * -tproxy_handle_time_wait6 (struct sk_buff *skb,int tproto,int thoff, -const struct xt_action_param *par, -struct sock *sk) -{ -const struct ipv6hdr *iph =ipv6_hdr (skb); -struct tcphdr _hdr, *hp; -const struct xt_tproxy_target_info_v1 *tgi = par->targinfo; - - hp =skb_header_pointer (skb, thoff,sizeof (_hdr), &_hdr); -if (hp ==NULL ) { -inet_twsk_put (inet_twsk (sk)); -return NULL ; - } - -if (hp->syn && !hp->rst && !hp->ack && !hp->fin) { -/* SYN to a TIME_WAIT socket, we'd rather redirect it -* to a listener socket if there's one */ -struct sock *sk2; - - sk2 =nf_tproxy_get_sock_v6 (dev_net (skb->dev), tproto, - &iph->saddr, - !ipv6_addr_any (&tgi->laddr.in6) ? &tgi->laddr.in6 : &iph->daddr, - hp->source, - tgi->lport ? tgi->lport : hp->dest, - skb->dev,NFT_LOOKUP_LISTENER ); -if (sk2) { -inet_twsk_deschedule (inet_twsk (sk), &tcp_death_row); -inet_twsk_put (inet_twsk (sk)); - sk = sk2; - } - } - -return sk; -} -static unsigned int tproxy_tg4 (struct sk_buff *skb,__be32 laddr,__be16 lport,u_int32_t mark_mask,u_int32_t mark_value)
@@ -150,6 +122,10 @@ tproxy_tg4(struct sk_buff *skb, __be32 laddr, __be16 lport, hp->source, hp->dest, skb->dev, NFT_LOOKUP_ESTABLISHED); + laddr =tproxy_laddr4 (skb, laddr, iph->daddr); +if (!lport) + lport = hp->dest; +/* UDP has no TCP_TIME_WAIT state, so we never enter here */ if (sk && sk->sk_state ==TCP_TIME_WAIT )/* reopening a TIME_WAIT connection needs special handling */
@@ -158,8 +134,8 @@ tproxy_tg4(struct sk_buff *skb, __be32 laddr, __be16 lport,/* no, there's no established connection, check if * there's a listener on the redirected addr/port */ sk =nf_tproxy_get_sock_v4 (dev_net (skb->dev), iph->protocol, - iph->saddr, laddr ? laddr : iph->daddr, - hp->source, lport ? lport : hp->dest, + iph->saddr, laddr, + hp->source, lport, skb->dev,NFT_LOOKUP_LISTENER );/* NOTE: assign_sock consumes our sk reference */
@@ -174,9 +150,9 @@ tproxy_tg4(struct sk_buff *skb, __be32 laddr, __be16 lport,return NF_ACCEPT ; } -pr_debug ("no socket, dropping: proto %hhu %08x:%hu -> %08x:%hu, mark: %x\n" , - iph->protocol,ntohl (iph->daddr),ntohs (hp->dest), -ntohl (laddr),ntohs (lport), skb->mark); +pr_debug ("no socket, dropping: proto %hhu %pI4:%hu -> %pI4:%hu, mark: %x\n" , + iph->protocol, &iph->saddr,ntohs (hp->source), + &iph->daddr,ntohs (hp->dest), skb->mark);return NF_DROP ; }
@@ -197,6 +173,88 @@ tproxy_tg4_v1(struct sk_buff *skb, const struct xt_action_param *par) }#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) + +static inline const struct in6_addr * +tproxy_laddr6 (struct sk_buff *skb,const struct in6_addr *user_laddr, +const struct in6_addr *daddr) +{ +struct inet6_dev *indev; +struct inet6_ifaddr *ifa; +struct in6_addr *laddr; + +if (!ipv6_addr_any (user_laddr)) +return user_laddr; + laddr =NULL ; + +rcu_read_lock (); + indev =__in6_dev_get (skb->dev); +if (indev) +list_for_each_entry (ifa, &indev->addr_list, if_list) { +if (ifa->flags & (IFA_F_TENTATIVE |IFA_F_DEPRECATED )) +continue ; + + laddr = &ifa->addr; +break ; + } +rcu_read_unlock (); + +return laddr ? laddr : daddr; +} + +/** +* tproxy_handle_time_wait6() - handle IPv6 TCP TIME_WAIT reopen redirections +* @skb: The skb being processed. +* @tproto: Transport protocol. +* @thoff: Transport protocol header offset. +* @par: Iptables target parameters. +* @sk: The TIME_WAIT TCP socket found by the lookup. +* +* We have to handle SYN packets arriving to TIME_WAIT sockets +* differently: instead of reopening the connection we should rather +* redirect the new connection to the proxy if there's a listener +* socket present. +* +* tproxy_handle_time_wait6() consumes the socket reference passed in. +* +* Returns the listener socket if there's one, the TIME_WAIT socket if +* no such listener is found, or NULL if the TCP header is incomplete. +*/ +static struct sock * +tproxy_handle_time_wait6 (struct sk_buff *skb,int tproto,int thoff, +const struct xt_action_param *par, +struct sock *sk) +{ +const struct ipv6hdr *iph =ipv6_hdr (skb); +struct tcphdr _hdr, *hp; +const struct xt_tproxy_target_info_v1 *tgi = par->targinfo; + + hp =skb_header_pointer (skb, thoff,sizeof (_hdr), &_hdr); +if (hp ==NULL ) { +inet_twsk_put (inet_twsk (sk)); +return NULL ; + } + +if (hp->syn && !hp->rst && !hp->ack && !hp->fin) { +/* SYN to a TIME_WAIT socket, we'd rather redirect it +* to a listener socket if there's one */ +struct sock *sk2; + + sk2 =nf_tproxy_get_sock_v6 (dev_net (skb->dev), tproto, + &iph->saddr, +tproxy_laddr6 (skb, &tgi->laddr.in6, &iph->daddr), + hp->source, + tgi->lport ? tgi->lport : hp->dest, + skb->dev,NFT_LOOKUP_LISTENER ); +if (sk2) { +inet_twsk_deschedule (inet_twsk (sk), &tcp_death_row); +inet_twsk_put (inet_twsk (sk)); + sk = sk2; + } + } + +return sk; +} +static unsigned int tproxy_tg6_v1 (struct sk_buff *skb,const struct xt_action_param *par) {
@@ -204,6 +262,8 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par)const struct xt_tproxy_target_info_v1 *tgi = par->targinfo;struct udphdr _hdr, *hp;struct sock *sk; +const struct in6_addr *laddr; +__be16 lport;int thoff;int tproto;
@@ -228,6 +288,9 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par) hp->source, hp->dest, par->in, NFT_LOOKUP_ESTABLISHED); + laddr =tproxy_laddr6 (skb, &tgi->laddr.in6, &iph->daddr); + lport = tgi->lport ? tgi->lport : hp->dest; +/* UDP has no TCP_TIME_WAIT state, so we never enter here */ if (sk && sk->sk_state ==TCP_TIME_WAIT )/* reopening a TIME_WAIT connection needs special handling */
@@ -236,10 +299,8 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par)/* no there's no established connection, check if * there's a listener on the redirected addr/port */ sk =nf_tproxy_get_sock_v6 (dev_net (skb->dev), tproto, - &iph->saddr, - !ipv6_addr_any (&tgi->laddr.in6) ? &tgi->laddr.in6 : &iph->daddr, - hp->source, - tgi->lport ? tgi->lport : hp->dest, + &iph->saddr, laddr, + hp->source, lport, par->in,NFT_LOOKUP_LISTENER );/* NOTE: assign_sock consumes our sk reference */
@@ -249,14 +310,15 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par) skb->mark = (skb->mark & ~tgi->mark_mask) ^ tgi->mark_value;pr_debug ("redirecting: proto %hhu %pI6:%hu -> %pI6:%hu, mark: %x\n" , - tproto, &iph->saddr,ntohs (hp->dest), - &tgi->laddr.in6,ntohs (tgi->lport), skb->mark); + tproto, &iph->saddr,ntohs (hp->source), + laddr,ntohs (lport), skb->mark);return NF_ACCEPT ; }pr_debug ("no socket, dropping: proto %hhu %pI6:%hu -> %pI6:%hu, mark: %x\n" , - tproto, &iph->saddr,ntohs (hp->dest), - &tgi->laddr.in6,ntohs (tgi->lport), skb->mark); + tproto, &iph->saddr,ntohs (hp->source), + &iph->daddr,ntohs (hp->dest), skb->mark); +return NF_DROP ; }
Re: [PATCH v2 9/9] tproxy: use the interface primary IP address as a default value for --on-ip
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 7 lines
From: Balazs Scheidler <[email protected]>
The REDIRECT target and the older TProxy versions used the primary address of the incoming interface as the default value of the --on-ip parameter. This was unintentionally changed during the initial TProxy submission and caused confusion among users.
Quoted 6 lines
Since IPv6 has no notion of primary address, we just select the first address on the list: this way the socket lookup finds wildcard bound sockets properly and we cannot really do better without the user telling us the IPv6 address of the proxy.
This is implemented for both IPv4 and IPv6.
Also applied, thanks a lot.
Re: [PATCH v2 9/9] tproxy: use the interface primary IP address as a default value for --on-ip
Quoted 13 lines · Patrick McHardy
Am 21.10.2010 12:47, schrieb KOVACS Krisztian:
Quoted 12 lines
From: Balazs Scheidler<[email protected]>
The REDIRECT target and the older TProxy versions used the primary address of the incoming interface as the default value of the --on-ip parameter. This was unintentionally changed during the initial TProxy submission and caused confusion among users.
Since IPv6 has no notion of primary address, we just select the first address on the list: this way the socket lookup finds wildcard bound sockets properly and we cannot really do better without the user telling us the IPv6 address of the proxy.
Quoted 5 lines
Quoted 1 line
This is implemented for both IPv4 and IPv6.
Also applied, thanks a lot.
Hoooray!! Thanks very, very, very much.
Just one followup question:
which kernel and iptables release is this now headed for?
AYJ
Re: [PATCH v2 9/9] tproxy: use the interface primary IP address as a default value for --on-ip
Am 21.10.2010 16:26, schrieb Amos Jeffries:
Quoted 8 lines · Patrick McHardy
Quoted 2 lines
Also applied, thanks a lot.
Hoooray!! Thanks very, very, very much.
Just one followup question:
which kernel and iptables release is this now headed for?
These patches will appear in 2.6.37-rc.