: Netfilter patches for 2.6.21
Subsystems (5)
cover : Netfilter patches for 2.6.21
Hi Dave,
following is a first batch of my netfilter patches for 2.6.21. Besides some cleanup, the highlights are:
- New SANE connection tracking helper
- New ip6tables Mobility Header match
- x_tables TCPMSS target port with IPv6 support
- Automatic liberal TCP connection tracking for picked up connections
- Optional source port randomization for SNAT
Once again the diffstat is quite huge, but mainly because of some harmless cleanup of x_tables wrappers, touching almost all iptables related files.
Please apply, thanks.
include/linux/netfilter/Kbuild | 1 include/linux/netfilter/nf_conntrack_sane.h | 21 + include/linux/netfilter/nf_conntrack_tcp.h | 4 include/linux/netfilter/xt_TCPMSS.h | 10 include/linux/netfilter_ipv4/ip_nat.h | 1 include/linux/netfilter_ipv4/ip_tables.h | 24 -- include/linux/netfilter_ipv4/ipt_TCPMSS.h | 7 include/linux/netfilter_ipv6/ip6_tables.h | 35 ++- include/linux/netfilter_ipv6/ip6t_mh.h | 15 + include/net/netfilter/nf_conntrack.h | 2 include/net/netfilter/nf_nat.h | 1 net/bridge/br_netfilter.c | 29 -- net/bridge/netfilter/ebt_ip.c | 1 net/bridge/netfilter/ebt_log.c | 1 net/ipv4/netfilter/Kconfig | 26 -- net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 40 +-- net/ipv4/netfilter/ip_nat_core.c | 12 - net/ipv4/netfilter/ip_nat_proto_tcp.c | 5 net/ipv4/netfilter/ip_nat_proto_udp.c | 5 net/ipv4/netfilter/ip_nat_rule.c | 32 +-- net/ipv4/netfilter/ip_tables.c | 40 +-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 15 - net/ipv4/netfilter/ipt_ECN.c | 13 - net/ipv4/netfilter/ipt_LOG.c | 18 + net/ipv4/netfilter/ipt_MASQUERADE.c | 9 net/ipv4/netfilter/ipt_NETMAP.c | 8 net/ipv4/netfilter/ipt_REDIRECT.c | 8 net/ipv4/netfilter/ipt_REJECT.c | 10 net/ipv4/netfilter/ipt_SAME.c | 8 net/ipv4/netfilter/ipt_TCPMSS.c | 207 ------------------- net/ipv4/netfilter/ipt_TOS.c | 11 - net/ipv4/netfilter/ipt_TTL.c | 11 - net/ipv4/netfilter/ipt_ULOG.c | 20 - net/ipv4/netfilter/ipt_addrtype.c | 9 net/ipv4/netfilter/ipt_ah.c | 10 net/ipv4/netfilter/ipt_ecn.c | 10 net/ipv4/netfilter/ipt_iprange.c | 10 net/ipv4/netfilter/ipt_owner.c | 9 net/ipv4/netfilter/ipt_recent.c | 12 - net/ipv4/netfilter/ipt_tos.c | 10 net/ipv4/netfilter/ipt_ttl.c | 11 - net/ipv4/netfilter/iptable_filter.c | 2 net/ipv4/netfilter/iptable_mangle.c | 2 net/ipv4/netfilter/iptable_raw.c | 2 net/ipv4/netfilter/nf_nat_core.c | 12 - net/ipv4/netfilter/nf_nat_proto_tcp.c | 4 net/ipv4/netfilter/nf_nat_proto_udp.c | 4 net/ipv4/netfilter/nf_nat_rule.c | 8 net/ipv4/netfilter/nf_nat_standalone.c | 6 net/ipv6/netfilter/Kconfig | 8 net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/ip6_tables.c | 12 - net/ipv6/netfilter/ip6t_HL.c | 17 - net/ipv6/netfilter/ip6t_LOG.c | 17 + net/ipv6/netfilter/ip6t_REJECT.c | 10 net/ipv6/netfilter/ip6t_ah.c | 8 net/ipv6/netfilter/ip6t_eui64.c | 8 net/ipv6/netfilter/ip6t_frag.c | 8 net/ipv6/netfilter/ip6t_hbh.c | 1 net/ipv6/netfilter/ip6t_hl.c | 11 - net/ipv6/netfilter/ip6t_ipv6header.c | 8 net/ipv6/netfilter/ip6t_mh.c | 108 ++++++++++ net/ipv6/netfilter/ip6t_owner.c | 8 net/ipv6/netfilter/ip6t_rt.c | 8 net/ipv6/netfilter/ip6table_filter.c | 21 - net/ipv6/netfilter/ip6table_mangle.c | 21 - net/ipv6/netfilter/ip6table_raw.c | 19 - net/netfilter/Kconfig | 39 +++ net/netfilter/Makefile | 2 net/netfilter/nf_conntrack_proto_tcp.c | 40 +-- net/netfilter/nf_conntrack_sane.c | 242 ++++++++++++++++++++++ net/netfilter/xt_CLASSIFY.c | 4 net/netfilter/xt_CONNMARK.c | 5 net/netfilter/xt_CONNSECMARK.c | 6 net/netfilter/xt_MARK.c | 8 net/netfilter/xt_SECMARK.c | 4 net/netfilter/xt_TCPMSS.c | 296 ++++++++++++++++++++++++++++ net/netfilter/xt_hashlimit.c | 1 net/sched/act_ipt.c | 2 net/sched/sch_sfq.c | 2 81 files changed, 1110 insertions(+), 607 deletions(-)
Eric Leblond:
[NETFILTER]: NAT: optional source port randomization support
Jan Engelhardt:
[NETFILTER]: Remove useless comparisons before assignments
[NETFILTER]: x_tables: fix return values for LOG/ULOG
[NETFILTER]: {ip,ip6}_tables: remove x_tables wrapper functions [NETFILTER]: {ip,ip6}_tables: use struct xt_table instead of redefined structure names
Masahide NAKAMURA:
[NETFILTER]: ip6_tables: support MH match
Michal Schmidt:
[NETFILTER]: Add SANE connection tracking helper
Patrick McHardy:
[NETFILTER]: tcp conntrack: do liberal tracking for picked up connections [NETFILTER]: nf_conntrack_tcp: make sysctl variables static [NETFILTER]: nf_nat: remove broken HOOKNAME macro
[NETFILTER]: bridge-netfilter: use nf_register_hooks/nf_unregister_hooks [NET]: Add UDPLITE support in a few missing spots
[NETFILTER]: add IPv6-capable TCPMSS target
[NETFILTER]: ip_tables: remove declaration of non-existant ipt_find_target function [NETFILTER]: ip6_tables: remove redundant structure definitions
PATCH 1/15 : Add SANE connection tracking helper
[NETFILTER]: Add SANE connection tracking helper
This is nf_conntrack_sane, a netfilter connection tracking helper module for the SANE protocol used by the 'saned' daemon to make scanners available via network. The SANE protocol uses separate control & data connections, similar to passive FTP. The helper module is needed to recognize the data connection as RELATED to the control one.
---
commit 75a10dc02458b33d7b14b388ca51ad2b91e81fd4
tree 29cf5cb4e665f67d28616fe50e29b8de40562294
parent 3d2362a6ba4b73a93179fdd340b961f9ef6fe1d8
author Michal Schmidt <[email protected]> Tue, 06 Feb 2007 07:36:47 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:47 +0100
include/linux/netfilter/nf_conntrack_sane.h | 21 ++ include/net/netfilter/nf_conntrack.h | 2 net/netfilter/Kconfig | 13 + net/netfilter/Makefile | 1 net/netfilter/nf_conntrack_sane.c | 242 +++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 0 deletions(-)
include/linux/netfilter/nf_conntrack_sane.h new file +21 -0
@@ -0,0 +1,21 @@ +#ifndef _NF_CONNTRACK_SANE_H +#define _NF_CONNTRACK_SANE_H +/* SANE tracking. */ + +#ifdef __KERNEL__ + +#define SANE_PORT 6566 + +enum sane_state { +SANE_STATE_NORMAL , +SANE_STATE_START_REQUESTED , +}; + +/* This structure exists only once per master */ +struct nf_ct_sane_master { +enum sane_state state; +}; + +#endif /* __KERNEL__ */ + +#endif /* _NF_CONNTRACK_SANE_H */
include/net/netfilter/nf_conntrack.h +2 -0
@@ -45,6 +45,7 @@ union nf_conntrack_expect_proto {#include <linux/netfilter/nf_conntrack_ftp.h> #include <linux/netfilter/nf_conntrack_pptp.h> #include <linux/netfilter/nf_conntrack_h323.h> +#include <linux/netfilter/nf_conntrack_sane.h> /* per conntrack: application helper private data */ union nf_conntrack_help {
@@ -52,6 +53,7 @@ union nf_conntrack_help {struct nf_ct_ftp_master ct_ftp_info;struct nf_ct_pptp_master ct_pptp_info;struct nf_ct_h323_master ct_h323_info; +struct nf_ct_sane_master ct_sane_info; };#include <linux/types.h>
net/netfilter/Kconfig +13 -0
@@ -235,6 +235,19 @@ config NF_CONNTRACK_PPTP To compile it as a module, choose M here. If unsure, say N. +config NF_CONNTRACK_SANE + tristate "SANE protocol support (EXPERIMENTAL)" + depends on EXPERIMENTAL && NF_CONNTRACK + help + SANE is a protocol for remote access to scanners as implemented + by the 'saned' daemon. Like FTP, it uses separate control and + data connections. + + With this module you can support SANE on a connection tracking + firewall. + + To compile it as a module, choose M here. If unsure, say N. + config NF_CONNTRACK_SIP tristate "SIP protocol support (EXPERIMENTAL)" depends on EXPERIMENTAL && NF_CONNTRACK
net/netfilter/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_NF_CONNTRACK_H323) += nf_co obj-$(CONFIG_NF_CONNTRACK_IRC) += nf_conntrack_irc.o obj-$(CONFIG_NF_CONNTRACK_NETBIOS_NS) += nf_conntrack_netbios_ns.o obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_conntrack_pptp.o +obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
net/netfilter/nf_conntrack_sane.c new file +242 -0
242 lines not on this page · raw message
Re: [NETFILTER 01/15]: Add SANE connection tracking helper
Quoted 2 lines · Patrick McHardy
[NETFILTER]: Add SANE connection tracking helper
This [naming] is almost confusing to SAME. ipt_SAME, that is.
Though if you ask for a substitution, I have to pass up on that for the moment.
Jan
Signature · 1 line
ft: http://freshmeat.net/p/chaostables/
Re: [NETFILTER 01/15]: Add SANE connection tracking helper
Quoted 8 lines · Jan Engelhardt
Quoted 1 line · Patrick McHardy
[NETFILTER]: Add SANE connection tracking helper
This [naming] is almost confusing to SAME.
ipt_SAME, that is.Though if you ask for a substitution, I have to pass up on that for the moment.
SAME is obsolete, and the name SANE comes from the same named application/protocol that this helper is supposed to support. Besided that, nobody is going to confuse helpers and targets since the modules have a different naming scheme and people generally don't care about target modules at all, they're autoloaded and could for all that people care all be named mod_foo.
I fail to see what you're trying to say.
Re: [NETFILTER 01/15]: Add SANE connection tracking helper
Quoted 9 lines · Patrick McHardy
Quoted 6 lines · Jan Engelhardt
On Feb 7 2007 09:22, Patrick McHardy wrote:
This [naming] is almost confusing to SAME.
ipt_SAME, that is.Though if you ask for a substitution, I have to pass up on that for the moment.
SAME is obsolete
Then everything is alright and I was line noise.
(SAME has not been removed yet, though.)
PATCH 2/15 : tcp conntrack: do liberal tracking for picked up connections
In reply to Patrick McHardy[NETFILTER]: tcp conntrack: do liberal tracking for picked up connections
Do liberal tracking (only RSTs need to be in-window) for connections picked up without seeing a SYN to deal with window scaling. Also change logging of invalid packets not to log packets accepted by liberal tracking to avoid spamming the logs.
Based on suggestion from James Ralston <[email protected]>
---
commit c37c212ee4396891fef4abdf856f97d024fca206
tree 4281179ae6085fc97acf0431bb9719d35598c91f
parent 75a10dc02458b33d7b14b388ca51ad2b91e81fd4
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:50 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:50 +0100
include/linux/netfilter/nf_conntrack_tcp.h | 4 ++- net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 40 ++++++++++----------------- net/netfilter/nf_conntrack_proto_tcp.c | 40 ++++++++++----------------- 3 files changed, 33 insertions(+), 51 deletions(-)
include/linux/netfilter/nf_conntrack_tcp.h +3 -1
@@ -27,6 +27,9 @@ #define IP_CT_TCP_FLAG_SACK_PERM 0x02/* This sender sent FIN first */ #define IP_CT_TCP_FLAG_CLOSE_INIT 0x04 +/* Be liberal in window checking */ +#define IP_CT_TCP_FLAG_BE_LIBERAL 0x08 +#ifdef __KERNEL__ struct ip_ct_tcp_state {
@@ -34,7 +37,6 @@ struct ip_ct_tcp_state {u_int32_t td_maxend;/* max of ack + max(win, 1) */ u_int32_t td_maxwin;/* max(win) */ u_int8_t td_scale;/* window scale factor */ -u_int8_t loose;/* used when connection picked up from the middle */ u_int8_t flags;/* per direction options */ };
net/ipv4/netfilter/ip_conntrack_proto_tcp.c +15 -25
@@ -50,12 +50,9 @@ static DEFINE_RWLOCK(tcp_lock);If it's non-zero, we mark only out of window RST segments as INVALID. */ int ip_ct_tcp_be_liberal__read_mostly =0 ; -/* When connection is picked up from the middle, how many packets are required -to pass in each direction when we assume we are in sync - if any side uses -window scaling, we lost the game. -If it is set to zero, we disable picking up already established +/* If it is set to zero, we disable picking up already established connections. */ -int ip_ct_tcp_loose__read_mostly =3 ; +int ip_ct_tcp_loose__read_mostly =1 ;/* Max number of the retransmitted packets without receiving an (acceptable) ACK from the destination. If this number is reached, a shorter timer
@@ -694,11 +691,10 @@ static int tcp_in_window(struct ip_ct_tcbefore (sack, receiver->td_end +1 ), after(ack, receiver->td_end - MAXACKWINDOW(sender))); -if (sender->loose || receiver->loose || - (before (seq, sender->td_maxend +1 ) && -after (end, sender->td_end - receiver->td_maxwin -1 ) && -before (sack, receiver->td_end +1 ) && -after (ack, receiver->td_end -MAXACKWINDOW (sender)))) { +if (before (seq, sender->td_maxend +1 ) && +after (end, sender->td_end - receiver->td_maxwin -1 ) && +before (sack, receiver->td_end +1 ) && +after (ack, receiver->td_end -MAXACKWINDOW (sender))) {/* * Take into account window scaling (RFC 1323). */
@@ -743,15 +739,13 @@ static int tcp_in_window(struct ip_ct_tc state->retrans =0 ; } } -/* -* Close the window of disabled window tracking :-) -*/ -if (sender->loose) - sender->loose--; - res =1 ; }else { -if (LOG_INVALID (IPPROTO_TCP )) + res =0 ; +if (sender->flags &IP_CT_TCP_FLAG_BE_LIBERAL || + ip_ct_tcp_be_liberal) + res =1 ; +if (!res &&LOG_INVALID (IPPROTO_TCP )) nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL, "ip_ct_tcp: %s ", before(seq, sender->td_maxend + 1) ?
@@ -762,8 +756,6 @@ static int tcp_in_window(struct ip_ct_tc : "ACK is over the upper bound (ACKed data not seen yet)" : "SEQ is under the lower bound (already ACKed data retransmitted)" : "SEQ is over the upper bound (over the window of the receiver)"); - - res = ip_ct_tcp_be_liberal; } DEBUGP("tcp_in_window: res=%i sender end=%u maxend=%u maxwin=%u "
@@ -1105,8 +1097,6 @@ #endiftcp_options (skb, iph, th, &conntrack->proto.tcp.seen[0 ]); conntrack->proto.tcp.seen[1 ].flags =0 ; - conntrack->proto.tcp.seen[0 ].loose = - conntrack->proto.tcp.seen[1 ].loose =0 ; }else if (ip_ct_tcp_loose ==0 ) {/* Don't try to pick up connections. */ return 0 ;
@@ -1127,11 +1117,11 @@ #endif conntrack->proto.tcp.seen[0 ].td_maxwin; conntrack->proto.tcp.seen[0 ].td_scale =0 ; -/* We assume SACK. Should we assume window scaling too? */ +/* We assume SACK and liberal window checking to handle +* window scaling */ conntrack->proto.tcp.seen[0 ].flags = - conntrack->proto.tcp.seen[1 ].flags =IP_CT_TCP_FLAG_SACK_PERM ; - conntrack->proto.tcp.seen[0 ].loose = - conntrack->proto.tcp.seen[1 ].loose = ip_ct_tcp_loose; + conntrack->proto.tcp.seen[1 ].flags =IP_CT_TCP_FLAG_SACK_PERM | +IP_CT_TCP_FLAG_BE_LIBERAL ; } conntrack->proto.tcp.seen[1 ].td_end =0 ;
net/netfilter/nf_conntrack_proto_tcp.c +15 -25
@@ -60,12 +60,9 @@ static DEFINE_RWLOCK(tcp_lock);If it's non-zero, we mark only out of window RST segments as INVALID. */ int nf_ct_tcp_be_liberal__read_mostly =0 ; -/* When connection is picked up from the middle, how many packets are required -to pass in each direction when we assume we are in sync - if any side uses -window scaling, we lost the game. -If it is set to zero, we disable picking up already established +/* If it is set to zero, we disable picking up already established connections. */ -int nf_ct_tcp_loose__read_mostly =3 ; +int nf_ct_tcp_loose__read_mostly =1 ;/* Max number of the retransmitted packets without receiving an (acceptable) ACK from the destination. If this number is reached, a shorter timer
@@ -650,11 +647,10 @@ static int tcp_in_window(struct ip_ct_tcbefore (sack, receiver->td_end +1 ), after(ack, receiver->td_end - MAXACKWINDOW(sender))); -if (sender->loose || receiver->loose || - (before (seq, sender->td_maxend +1 ) && -after (end, sender->td_end - receiver->td_maxwin -1 ) && -before (sack, receiver->td_end +1 ) && -after (ack, receiver->td_end -MAXACKWINDOW (sender)))) { +if (before (seq, sender->td_maxend +1 ) && +after (end, sender->td_end - receiver->td_maxwin -1 ) && +before (sack, receiver->td_end +1 ) && +after (ack, receiver->td_end -MAXACKWINDOW (sender))) {/* * Take into account window scaling (RFC 1323). */
@@ -699,15 +695,13 @@ static int tcp_in_window(struct ip_ct_tc state->retrans =0 ; } } -/* -* Close the window of disabled window tracking :-) -*/ -if (sender->loose) - sender->loose--; - res =1 ; }else { -if (LOG_INVALID (IPPROTO_TCP )) + res =0 ; +if (sender->flags &IP_CT_TCP_FLAG_BE_LIBERAL || + nf_ct_tcp_be_liberal) + res =1 ; +if (!res &&LOG_INVALID (IPPROTO_TCP )) nf_log_packet(pf, 0, skb, NULL, NULL, NULL, "nf_ct_tcp: %s ", before(seq, sender->td_maxend + 1) ?
@@ -718,8 +712,6 @@ static int tcp_in_window(struct ip_ct_tc : "ACK is over the upper bound (ACKed data not seen yet)" : "SEQ is under the lower bound (already ACKed data retransmitted)" : "SEQ is over the upper bound (over the window of the receiver)"); - - res = nf_ct_tcp_be_liberal; } DEBUGP("tcp_in_window: res=%i sender end=%u maxend=%u maxwin=%u "
@@ -1063,8 +1055,6 @@ #endiftcp_options (skb, dataoff, th, &conntrack->proto.tcp.seen[0 ]); conntrack->proto.tcp.seen[1 ].flags =0 ; - conntrack->proto.tcp.seen[0 ].loose = - conntrack->proto.tcp.seen[1 ].loose =0 ; }else if (nf_ct_tcp_loose ==0 ) {/* Don't try to pick up connections. */ return 0 ;
@@ -1085,11 +1075,11 @@ #endif conntrack->proto.tcp.seen[0 ].td_maxwin; conntrack->proto.tcp.seen[0 ].td_scale =0 ; -/* We assume SACK. Should we assume window scaling too? */ +/* We assume SACK and liberal window checking to handle +* window scaling */ conntrack->proto.tcp.seen[0 ].flags = - conntrack->proto.tcp.seen[1 ].flags =IP_CT_TCP_FLAG_SACK_PERM ; - conntrack->proto.tcp.seen[0 ].loose = - conntrack->proto.tcp.seen[1 ].loose = nf_ct_tcp_loose; + conntrack->proto.tcp.seen[1 ].flags =IP_CT_TCP_FLAG_SACK_PERM | +IP_CT_TCP_FLAG_BE_LIBERAL ; } conntrack->proto.tcp.seen[1 ].td_end =0 ;
PATCH 3/15 : nf_conntrack_tcp: make sysctl variables static
In reply to Patrick McHardy[NETFILTER]: nf_conntrack_tcp: make sysctl variables static
sysctls are registered by the protocol module itself since 2.6.19, no need to have them visible to others.
---
commit 7d1ff8ef614415a0cad0eb9a357e614673ff5129
tree 4281179ae6085fc97acf0431bb9719d35598c91f
parent c37c212ee4396891fef4abdf856f97d024fca206
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +0100
0 files changed, 0 insertions(+), 0 deletions(-)
David Miller
maintainerRe: [NETFILTER 03/15]: nf_conntrack_tcp: make sysctl variables static
From: Patrick McHardy <[email protected]>
Date: Wed, 7 Feb 2007 09:22:37 +0100 (MET)
Quoted 7 lines
[NETFILTER]:
nf_conntrack_tcp: make sysctl variables staticsysctls are registered by the protocol module itself since 2.6.19, no need to have them visible to others.
Signed-off-by Patrick McHardy <[email protected]>
Quoted 8 lines
---
commit7d1ff8ef614415a0cad0eb9a357e614673ff5129
tree4281179ae6085fc97acf0431bb9719d35598c91f
parentc37c212ee4396891fef4abdf856f97d024fca206
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +01000 files changed, 0 insertions(+), 0 deletions(-)
Empty patch? :-)
Re: [NETFILTER 03/15]: nf_conntrack_tcp: make sysctl variables static
Quoted 18 lines · David Miller
From: Patrick McHardy <[email protected]>
Date: Wed, 7 Feb 2007 09:22:37 +0100 (MET)Quoted 14 lines
[NETFILTER]:
nf_conntrack_tcp: make sysctl variables staticsysctls are registered by the protocol module itself since 2.6.19, no need to have them visible to others.
Signed-off-by Patrick McHardy <[email protected]>---
commit7d1ff8ef614415a0cad0eb9a357e614673ff5129
tree4281179ae6085fc97acf0431bb9719d35598c91f
parentc37c212ee4396891fef4abdf856f97d024fca206
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:32 +0100
Quoted 4 lines
Quoted 1 line
0 files changed, 0 insertions(+), 0 deletions(-)Empty patch? :-)
Oops, sorry :) I started using stgit some time ago, but I still sometimes forget to refresh the patches. I'll resend tomorrow, please just drop everything.
David Miller
maintainerRe: [NETFILTER 03/15]: nf_conntrack_tcp: make sysctl variables static
From: Patrick McHardy <[email protected]>
Date: Thu, 08 Feb 2007 00:09:24 +0100
Quoted 3 lines
Oops, sorry :) I started using stgit some time ago, but I still sometimes forget to refresh the patches. I'll resend tomorrow, please just drop everything.
Everything else applied cleanly, so I'll leave it all in.
Just resent me that 3rd patch which was empty.
I'll push today's bits to the kernel.org net-2.6.21 tree after I do a build sanity test or two.
Re: [NETFILTER 03/15]: nf_conntrack_tcp: make sysctl variables static
Quoted 9 lines · David Miller
From: Patrick McHardy <[email protected]>
Date: Thu, 08 Feb 2007 00:09:24 +0100Quoted 3 lines
Oops, sorry :) I started using stgit some time ago, but I still sometimes forget to refresh the patches. I'll resend tomorrow, please just drop everything.
Quoted 6 lines
Everything else applied cleanly, so I'll leave it all in.
Just resent me that 3rd patch which was empty.
I'll push today's bits to the kernel.org net-2.6.21 tree after I do a build sanity test or two.
OK thanks. It seems I didn't accidentally added it to a follow-up patch, so everything should be fine :) I'll resend that patch tomorrow.
PATCH 4/15 : Remove useless comparisons before assignments
In reply to Patrick McHardy[NETFILTER]: Remove useless comparisons before assignments
Remove unnecessary if() constructs before assignment.
---
commit 190276633aff2a1c54c2c5d12788f62c58067f2b
tree 9c8daa83b4803cdc04c6b10e75a25dea5d39bec6
parent 7d1ff8ef614415a0cad0eb9a357e614673ff5129
author Jan Engelhardt <[email protected]> Tue, 06 Feb 2007 07:36:51 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:35 +0100
net/ipv6/netfilter/ip6t_HL.c | 3 +-- net/netfilter/xt_CLASSIFY.c | 4 +--- net/netfilter/xt_CONNMARK.c | 5 ++--- net/netfilter/xt_CONNSECMARK.c | 6 ++---- net/netfilter/xt_MARK.c | 8 ++------ net/netfilter/xt_SECMARK.c | 4 +--- 6 files changed, 9 insertions(+), 21 deletions(-)
net/ipv6/netfilter/ip6t_HL.c +1 -2
@@ -52,8 +52,7 @@ static unsigned int ip6t_hl_target(strucbreak ; } -if (new_hl != ip6h->hop_limit) - ip6h->hop_limit = new_hl; + ip6h->hop_limit = new_hl;return IP6T_CONTINUE ; }
net/netfilter/xt_CLASSIFY.c +1 -3
@@ -33,9 +33,7 @@ target(struct sk_buff **pskb, {const struct xt_classify_target_info *clinfo = targinfo; -if ((*pskb)->priority != clinfo->priority) - (*pskb)->priority = clinfo->priority; - + (*pskb)->priority = clinfo->priority;return XT_CONTINUE ; }
net/netfilter/xt_CONNMARK.c +2 -3
@@ -61,7 +61,7 @@ #if defined(CONFIG_IP_NF_CONNTRACK) || d#else nf_conntrack_event_cache (IPCT_MARK , *pskb);#endif - } + }break ;case XT_CONNMARK_SAVE : newmark = (*ctmark & ~markinfo->mask) |
@@ -78,8 +78,7 @@ #endifcase XT_CONNMARK_RESTORE : mark = (*pskb)->mark; diff = (*ctmark ^ mark) & markinfo->mask; -if (diff !=0 ) - (*pskb)->mark = mark ^ diff; + (*pskb)->mark = mark ^ diff;break ; } }
net/netfilter/xt_CONNSECMARK.c +2 -4
@@ -41,8 +41,7 @@ static void secmark_save(struct sk_buff connsecmark =nf_ct_get_secmark (skb, &ctinfo);if (connsecmark && !*connsecmark) -if (*connsecmark != skb->secmark) - *connsecmark = skb->secmark; + *connsecmark = skb->secmark; } }
@@ -58,8 +57,7 @@ static void secmark_restore(struct sk_bu connsecmark =nf_ct_get_secmark (skb, &ctinfo);if (connsecmark && *connsecmark) -if (skb->secmark != *connsecmark) - skb->secmark = *connsecmark; + skb->secmark = *connsecmark; } }
net/netfilter/xt_MARK.c +2 -6
@@ -31,9 +31,7 @@ target_v0(struct sk_buff **pskb, {const struct xt_mark_target_info *markinfo = targinfo; -if ((*pskb)->mark != markinfo->mark) - (*pskb)->mark = markinfo->mark; - + (*pskb)->mark = markinfo->mark;return XT_CONTINUE ; }
@@ -62,9 +60,7 @@ target_v1(struct sk_buff **pskb,break ; } -if ((*pskb)->mark != mark) - (*pskb)->mark = mark; - + (*pskb)->mark = mark;return XT_CONTINUE ; }
net/netfilter/xt_SECMARK.c +1 -3
@@ -47,9 +47,7 @@ static unsigned int target(struct sk_bufBUG (); } -if ((*pskb)->secmark != secmark) - (*pskb)->secmark = secmark; - + (*pskb)->secmark = secmark;return XT_CONTINUE ; }
PATCH 5/15 : nf_nat: remove broken HOOKNAME macro
In reply to Patrick McHardy[NETFILTER]: nf_nat: remove broken HOOKNAME macro
---
commit cbc5f2f9419e2ef388ce01f9ace8cbb76ff8e357
tree b1aceae682be063d4769a7f3ad4f108ce01db0cb
parent 190276633aff2a1c54c2c5d12788f62c58067f2b
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:52 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:36 +0100
net/ipv4/netfilter/nf_nat_standalone.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
net/ipv4/netfilter/nf_nat_standalone.c +0 -6
@@ -32,12 +32,6 @@ #else #define DEBUGP(format, args...)#endif -#define HOOKNAME (hooknum) ((hooknum) == NF_IP_POST_ROUTING ? "POST_ROUTING" \ - : ((hooknum) == NF_IP_PRE_ROUTING ? "PRE_ROUTING" \ - : ((hooknum) == NF_IP_LOCAL_OUT ? "LOCAL_OUT" \ - : ((hooknum) == NF_IP_LOCAL_IN ? "LOCAL_IN" \ - : "*ERROR*"))) -#ifdef CONFIG_XFRM static void nat_decode_session (struct sk_buff *skb,struct flowi *fl) {
PATCH 6/15 : bridge-netfilter: use nf_register_hooks/nf_unregister_hooks
In reply to Patrick McHardy[NETFILTER]: bridge-netfilter: use nf_register_hooks/nf_unregister_hooks
Additionally mark the init function __init.
---
commit bcefbe8fd50b101d89a8cab0a7fe251213a88e70
tree cfb8bc1f59cdd8c21eb935701c146a07fbb8a282
parent cbc5f2f9419e2ef388ce01f9ace8cbb76ff8e357
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:54 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:36 +0100
net/bridge/br_netfilter.c | 29 +++++++---------------------- 1 files changed, 7 insertions(+), 22 deletions(-)
net/bridge/br_netfilter.c +7 -22
@@ -949,44 +949,29 @@ static ctl_table brnf_net_table[] = { };#endif -int br_netfilter_init (void ) +int __init br_netfilter_init (void ) { -int i; - -for (i =0 ; i <ARRAY_SIZE (br_nf_ops); i++) { -int ret; - -if ((ret =nf_register_hook (&br_nf_ops[i])) >=0 ) -continue ; - -while (i--) -nf_unregister_hook (&br_nf_ops[i]); +int ret; + ret =nf_register_hooks (br_nf_ops,ARRAY_SIZE (br_nf_ops)); +if (ret <0 )return ret; - } -#ifdef CONFIG_SYSCTL brnf_sysctl_header =register_sysctl_table (brnf_net_table,0 );if (brnf_sysctl_header ==NULL ) {printk (KERN_WARNING "br_netfilter: can't register to sysctl.\n" ); -for (i =0 ; i <ARRAY_SIZE (br_nf_ops); i++) -nf_unregister_hook (&br_nf_ops[i]); -return -EFAULT ; +nf_unregister_hooks (br_nf_ops,ARRAY_SIZE (br_nf_ops)); +return -ENOMEM ; }#endif -printk (KERN_NOTICE "Bridge firewalling registered\n" ); -return 0 ; }void br_netfilter_fini (void ) { -int i; - -for (i =ARRAY_SIZE (br_nf_ops) -1 ; i >=0 ; i--) -nf_unregister_hook (&br_nf_ops[i]); +nf_unregister_hooks (br_nf_ops,ARRAY_SIZE (br_nf_ops));#ifdef CONFIG_SYSCTL unregister_sysctl_table (brnf_sysctl_header);#endif
PATCH 7/15 : Add UDPLITE support in a few missing spots
In reply to Patrick McHardy[NET]: Add UDPLITE support in a few missing spots
---
commit 25236bad10d061ba7fce42608ae3db8369f33bd0
tree 1ff1e6c42740d9000e4bd3b1d761503e347b76d2
parent bcefbe8fd50b101d89a8cab0a7fe251213a88e70
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:55 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:37:36 +0100
net/bridge/netfilter/ebt_ip.c | 1 + net/bridge/netfilter/ebt_log.c | 1 + net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 + net/netfilter/xt_hashlimit.c | 1 + net/sched/sch_sfq.c | 2 ++ 5 files changed, 6 insertions(+), 0 deletions(-)
net/bridge/netfilter/ebt_ip.c +1 -0
@@ -93,6 +93,7 @@ static int ebt_ip_check(const char *tablreturn -EINVAL ;if (info->protocol !=IPPROTO_TCP && info->protocol !=IPPROTO_UDP && + info->protocol !=IPPROTO_UDPLITE && info->protocol !=IPPROTO_SCTP && info->protocol !=IPPROTO_DCCP )return -EINVAL ;
net/bridge/netfilter/ebt_log.c +1 -0
@@ -96,6 +96,7 @@ ebt_log_packet(unsigned int pf, unsigned NIPQUAD(ih->daddr), ih->tos, ih->protocol);if (ih->protocol ==IPPROTO_TCP || ih->protocol ==IPPROTO_UDP || + ih->protocol ==IPPROTO_UDPLITE || ih->protocol ==IPPROTO_SCTP || ih->protocol ==IPPROTO_DCCP ) {struct tcpudphdr _ports, *pptr;
net/ipv4/netfilter/ipt_CLUSTERIP.c +1 -0
@@ -247,6 +247,7 @@ clusterip_hashfn(struct sk_buff *skb, stswitch (iph->protocol) {case IPPROTO_TCP :case IPPROTO_UDP : +case IPPROTO_UDPLITE :case IPPROTO_SCTP :case IPPROTO_DCCP :case IPPROTO_ICMP :
net/netfilter/xt_hashlimit.c +1 -0
@@ -414,6 +414,7 @@ #endifswitch (nexthdr) {case IPPROTO_TCP :case IPPROTO_UDP : +case IPPROTO_UDPLITE :case IPPROTO_SCTP :case IPPROTO_DCCP : ports = skb_header_pointer(skb, protoff, sizeof(_ports),
net/sched/sch_sfq.c +2 -0
@@ -143,6 +143,7 @@ static unsigned sfq_hash(struct sfq_scheif (!(iph->frag_off&htons (IP_MF |IP_OFFSET )) && (iph->protocol ==IPPROTO_TCP || iph->protocol ==IPPROTO_UDP || + iph->protocol ==IPPROTO_UDPLITE || iph->protocol ==IPPROTO_SCTP || iph->protocol ==IPPROTO_DCCP || iph->protocol ==IPPROTO_ESP ))
@@ -156,6 +157,7 @@ static unsigned sfq_hash(struct sfq_sche h2 = iph->saddr.s6_addr32[3 ]^iph->nexthdr;if (iph->nexthdr ==IPPROTO_TCP || iph->nexthdr ==IPPROTO_UDP || + iph->nexthdr ==IPPROTO_UDPLITE || iph->nexthdr ==IPPROTO_SCTP || iph->nexthdr ==IPPROTO_DCCP || iph->nexthdr ==IPPROTO_ESP )
PATCH 8/15 : add IPv6-capable TCPMSS target
In reply to Patrick McHardy[NETFILTER]: add IPv6-capable TCPMSS target
---
commit b7bc3a6250a99d42d8ba890cf89339a23b011a5e
tree 398fbf02341ed500ba3197f50619fb1dda1b6d0d
parent 25236bad10d061ba7fce42608ae3db8369f33bd0
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 07:36:58 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:52:23 +0100
include/linux/netfilter/Kbuild | 1 include/linux/netfilter/xt_TCPMSS.h | 10 + include/linux/netfilter_ipv4/ipt_TCPMSS.h | 7 - net/ipv4/netfilter/Kconfig | 26 --- net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/ipt_TCPMSS.c | 207 -------------------- net/netfilter/Kconfig | 26 +++ net/netfilter/Makefile | 1 net/netfilter/xt_TCPMSS.c | 296 +++++++++++++++++++++++++++++ 9 files changed, 337 insertions(+), 238 deletions(-)
include/linux/netfilter/Kbuild +1 -0
@@ -33,6 +33,7 @@ header-y += xt_tcpmss.h header-y += xt_tcpudp.h header-y += xt_SECMARK.h header-y += xt_CONNSECMARK.h +header-y += xt_TCPMSS.h unifdef-y += nf_conntrack_common.h unifdef-y += nf_conntrack_ftp.h
include/linux/netfilter/xt_TCPMSS.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef _XT_TCPMSS_H +#define _XT_TCPMSS_H + +struct xt_tcpmss_info { +u_int16_t mss; +}; + +#define XT_TCPMSS_CLAMP_PMTU 0xffff + +#endif /* _XT_TCPMSS_H */
include/linux/netfilter_ipv4/ipt_TCPMSS.h +3 -4
@@ -1,10 +1,9 @@#ifndef _IPT_TCPMSS_H#define _IPT_TCPMSS_H -struct ipt_tcpmss_info { -u_int16_t mss; -}; +#include <linux/netfilter/xt_TCPMSS.h> -#define IPT_TCPMSS_CLAMP_PMTU 0xffff +#define ipt_tcpmss_info xt_tcpmss_info +#define IPT_TCPMSS_CLAMP_PMTU XT_TCPMSS_CLAMP_PMTU#endif /*_IPT_TCPMSS_H*/
net/ipv4/netfilter/Kconfig +0 -26
@@ -361,32 +361,6 @@ config IP_NF_TARGET_ULOG To compile it as a module, choose M here. If unsure, say N. -config IP_NF_TARGET_TCPMSS - tristate "TCPMSS target support" - depends on IP_NF_IPTABLES - ---help--- - This option adds a `TCPMSS' target, which allows you to alter the - MSS value of TCP SYN packets, to control the maximum size for that - connection (usually limiting it to your outgoing interface's MTU - minus 40). - - This is used to overcome criminally braindead ISPs or servers which - block ICMP Fragmentation Needed packets. The symptoms of this - problem are that everything works fine from your Linux - firewall/router, but machines behind it can never exchange large - packets: - 1) Web browsers connect, then hang with no data received. - 2) Small mail works fine, but large emails hang. - 3) ssh works fine, but scp hangs after initial handshaking. - - Workaround: activate this option and add a rule to your firewall - configuration like: - - iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN \ - -j TCPMSS --clamp-mss-to-pmtu - - To compile it as a module, choose M here. If unsure, say N. - # NAT + specific targets: ip_conntrack config IP_NF_NAT tristate "Full NAT"
net/ipv4/netfilter/Makefile +0 -1
@@ -103,7 +103,6 @@ obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_S obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o -obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
net/ipv4/netfilter/ipt_TCPMSS.c deleted +0 -207
207 lines not on this page · raw message
net/netfilter/Kconfig +26 -0
@@ -395,6 +395,32 @@ config NETFILTER_XT_TARGET_CONNSECMARK To compile it as a module, choose M here. If unsure, say N. +config NETFILTER_XT_TARGET_TCPMSS + tristate '"TCPMSS" target support' + depends on NETFILTER_XTABLES && (IPV6 || IPV6=n) + ---help--- + This option adds a `TCPMSS' target, which allows you to alter the + MSS value of TCP SYN packets, to control the maximum size for that + connection (usually limiting it to your outgoing interface's MTU + minus 40). + + This is used to overcome criminally braindead ISPs or servers which + block ICMP Fragmentation Needed packets. The symptoms of this + problem are that everything works fine from your Linux + firewall/router, but machines behind it can never exchange large + packets: + 1) Web browsers connect, then hang with no data received. + 2) Small mail works fine, but large emails hang. + 3) ssh works fine, but scp hangs after initial handshaking. + + Workaround: activate this option and add a rule to your firewall + configuration like: + + iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN \ + -j TCPMSS --clamp-mss-to-pmtu + + To compile it as a module, choose M here. If unsure, say N. + config NETFILTER_XT_MATCH_COMMENT tristate '"comment" match support' depends on NETFILTER_XTABLES
net/netfilter/Makefile +1 -0
@@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o +obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o # matches
net/netfilter/xt_TCPMSS.c new file +296 -0
296 lines not on this page · raw message
PATCH 9/15 : NAT: optional source port randomization support
In reply to Patrick McHardy[NETFILTER]: NAT: optional source port randomization support
This patch adds support to NAT to randomize source ports.
---
commit 7ef8c3390c8e383f7bf590b11623aed2cf493dfa
tree 2b56ae564f08577e1ff747f941daac38fe97651a
parent b7bc3a6250a99d42d8ba890cf89339a23b011a5e
author Eric Leblond <[email protected]> Tue, 06 Feb 2007 07:37:00 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:11 +0100
include/linux/netfilter_ipv4/ip_nat.h | 1 + include/net/netfilter/nf_nat.h | 1 + net/ipv4/netfilter/ip_nat_core.c | 12 ++++++++++-- net/ipv4/netfilter/ip_nat_proto_tcp.c | 5 +++++ net/ipv4/netfilter/ip_nat_proto_udp.c | 5 +++++ net/ipv4/netfilter/ip_nat_rule.c | 4 ++++ net/ipv4/netfilter/nf_nat_core.c | 12 ++++++++++-- net/ipv4/netfilter/nf_nat_proto_tcp.c | 4 ++++ net/ipv4/netfilter/nf_nat_proto_udp.c | 4 ++++ net/ipv4/netfilter/nf_nat_rule.c | 4 ++++ 10 files changed, 48 insertions(+), 4 deletions(-)
include/linux/netfilter_ipv4/ip_nat.h +1 -0
@@ -16,6 +16,7 @@ #define HOOK2MANIP(hooknum) ((hooknum) !#define IP_NAT_RANGE_MAP_IPS 1#define IP_NAT_RANGE_PROTO_SPECIFIED 2 +#define IP_NAT_RANGE_PROTO_RANDOM 4/* add randomness to "port" selection */ /* NAT sequence number modifications */ struct ip_nat_seq {
include/net/netfilter/nf_nat.h +1 -0
@@ -16,6 +16,7 @@ #define HOOK2MANIP(hooknum) ((hooknum) !#define IP_NAT_RANGE_MAP_IPS 1#define IP_NAT_RANGE_PROTO_SPECIFIED 2 +#define IP_NAT_RANGE_PROTO_RANDOM 4/* NAT sequence number modifications */ struct nf_nat_seq {
net/ipv4/netfilter/ip_nat_core.c +10 -2
@@ -246,8 +246,9 @@ get_unique_tuple(struct ip_conntrack_tupif (maniptype ==IP_NAT_MANIP_SRC ) {if (find_appropriate_src (orig_tuple, tuple, range)) {DEBUGP ("get_unique_tuple: Found current src map\n" ); -if (!ip_nat_used_tuple (tuple, conntrack)) -return ; +if (!(range->flags &IP_NAT_RANGE_PROTO_RANDOM )) +if (!ip_nat_used_tuple (tuple, conntrack)) +return ; } }
@@ -261,6 +262,13 @@ get_unique_tuple(struct ip_conntrack_tup proto =ip_nat_proto_find_get (orig_tuple->dst.protonum); +/* Change protocol info to have some randomization */ +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) { + proto->unique_tuple (tuple, range, maniptype, conntrack); +ip_nat_proto_put (proto); +return ; + } +/* Only bother mapping if it's not already in range and unique */ if ((!(range->flags &IP_NAT_RANGE_PROTO_SPECIFIED ) || proto->in_range(tuple, maniptype, &range->min, &range->max))
net/ipv4/netfilter/ip_nat_proto_tcp.c +5 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/init.h> +#include <linux/random.h> #include <linux/netfilter.h> #include <linux/ip.h> #include <linux/tcp.h>
@@ -75,6 +76,10 @@ tcp_unique_tuple(struct ip_conntrack_tup range_size =ntohs (range->max.tcp.port) - min +1 ; } +/* Start from random port to avoid prediction */ +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) + port =net_random (); +for (i =0 ; i < range_size; i++, port++) { *portptr =htons (min + port % range_size);if (!ip_nat_used_tuple (tuple, conntrack)) {
net/ipv4/netfilter/ip_nat_proto_udp.c +5 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/init.h> +#include <linux/random.h> #include <linux/netfilter.h> #include <linux/ip.h> #include <linux/udp.h>
@@ -74,6 +75,10 @@ udp_unique_tuple(struct ip_conntrack_tup range_size =ntohs (range->max.udp.port) - min +1 ; } +/* Start from random port to avoid prediction */ +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) + port =net_random (); +for (i =0 ; i < range_size; i++, port++) { *portptr =htons (min + port % range_size);if (!ip_nat_used_tuple (tuple, conntrack))
net/ipv4/netfilter/ip_nat_rule.c +4 -0
@@ -193,6 +193,10 @@ static int ipt_dnat_checkentry(const chaprintk ("DNAT: multiple ranges no longer supported\n" );return 0 ; } +if (mr->range[0 ].flags &IP_NAT_RANGE_PROTO_RANDOM ) { +printk ("DNAT: port randomization not supported\n" ); +return 0 ; + }return 1 ; }
net/ipv4/netfilter/nf_nat_core.c +10 -2
@@ -254,8 +254,9 @@ get_unique_tuple(struct nf_conntrack_tupif (maniptype ==IP_NAT_MANIP_SRC ) {if (find_appropriate_src (orig_tuple, tuple, range)) {DEBUGP ("get_unique_tuple: Found current src map\n" ); -if (!nf_nat_used_tuple (tuple, ct)) -return ; +if (!(range->flags &IP_NAT_RANGE_PROTO_RANDOM )) +if (!nf_nat_used_tuple (tuple, ct)) +return ; } }
@@ -269,6 +270,13 @@ get_unique_tuple(struct nf_conntrack_tup proto =nf_nat_proto_find_get (orig_tuple->dst.protonum); +/* Change protocol info to have some randomization */ +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) { + proto->unique_tuple (tuple, range, maniptype, ct); +nf_nat_proto_put (proto); +return ; + } +/* Only bother mapping if it's not already in range and unique */ if ((!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) || proto->in_range(tuple, maniptype, &range->min, &range->max)) &&
net/ipv4/netfilter/nf_nat_proto_tcp.c +4 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/init.h> +#include <linux/random.h> #include <linux/ip.h> #include <linux/tcp.h>
@@ -75,6 +76,9 @@ tcp_unique_tuple(struct nf_conntrack_tup range_size =ntohs (range->max.tcp.port) - min +1 ; } +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) + port =net_random (); +for (i =0 ; i < range_size; i++, port++) { *portptr =htons (min + port % range_size);if (!nf_nat_used_tuple (tuple, ct))
net/ipv4/netfilter/nf_nat_proto_udp.c +4 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/init.h> +#include <linux/random.h> #include <linux/ip.h> #include <linux/udp.h>
@@ -73,6 +74,9 @@ udp_unique_tuple(struct nf_conntrack_tup range_size =ntohs (range->max.udp.port) - min +1 ; } +if (range->flags &IP_NAT_RANGE_PROTO_RANDOM ) + port =net_random (); +for (i =0 ; i < range_size; i++, port++) { *portptr =htons (min + port % range_size);if (!nf_nat_used_tuple (tuple, ct))
net/ipv4/netfilter/nf_nat_rule.c +4 -0
@@ -226,6 +226,10 @@ static int ipt_dnat_checkentry(const chaprintk ("DNAT: multiple ranges no longer supported\n" );return 0 ; } +if (mr->range[0 ].flags &IP_NAT_RANGE_PROTO_RANDOM ) { +printk ("DNAT: port randomization not supported\n" ); +return 0 ; + }return 1 ; }
PATCH 10/15 : x_tables: fix return values for LOG/ULOG
In reply to Patrick McHardy[NETFILTER]: x_tables: fix return values for LOG/ULOG
---
commit ed4ff97f3d8c948c5ef177b80c1432e739fa0c94
tree b5f9939908568ea4785ef722e0289ef627e55541
parent 7ef8c3390c8e383f7bf590b11623aed2cf493dfa
author Jan Engelhardt <[email protected]> Tue, 06 Feb 2007 07:37:01 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:11 +0100
net/ipv4/netfilter/ipt_LOG.c | 7 +++++-- net/ipv4/netfilter/ipt_ULOG.c | 7 ++++--- net/ipv6/netfilter/ip6t_LOG.c | 7 +++++-- 3 files changed, 14 insertions(+), 7 deletions(-)
net/ipv4/netfilter/ipt_LOG.c +5 -2
@@ -471,8 +471,11 @@ static struct nf_logger ipt_log_logger =static int __init ipt_log_init (void ) { -if (ipt_register_target (&ipt_log_reg)) -return -EINVAL ; +int ret; + + ret =ipt_register_target (&ipt_log_reg); +if (ret <0 ) +return ret;if (nf_log_register (PF_INET , &ipt_log_logger) <0 ) {printk (KERN_WARNING "ipt_LOG: not logging via system console " "since somebody else already registered for PF_INET\n" );
net/ipv4/netfilter/ipt_ULOG.c +4 -3
@@ -379,7 +379,7 @@ static struct nf_logger ipt_ulog_loggerstatic int __init ipt_ulog_init (void ) { -int i; +int ret, i;DEBUGP ("ipt_ULOG: init module\n" );
@@ -400,9 +400,10 @@ static int __init ipt_ulog_init(void)if (!nflognl)return -ENOMEM ; -if (ipt_register_target (&ipt_ulog_reg) !=0 ) { + ret =ipt_register_target (&ipt_ulog_reg); +if (ret <0 ) {sock_release (nflognl->sk_socket); -return -EINVAL ; +return ret; }if (nflog)nf_log_register (PF_INET , &ipt_ulog_logger);
net/ipv6/netfilter/ip6t_LOG.c +5 -2
@@ -482,8 +482,11 @@ static struct nf_logger ip6t_logger = {static int __init ip6t_log_init (void ) { -if (ip6t_register_target (&ip6t_log_reg)) -return -EINVAL ; +int ret; + + ret =ip6t_register_target (&ip6t_log_reg); +if (ret <0 ) +return ret;if (nf_log_register (PF_INET6 , &ip6t_logger) <0 ) {printk (KERN_WARNING "ip6t_LOG: not logging via system console " "since somebody else already registered for PF_INET6\n" );
PATCH 11/15 : {ip, ip6}_tables: remove x_tables wrapper functions
In reply to Patrick McHardy[NETFILTER]: {ip,ip6}_tables: remove x_tables wrapper functions
Use the x_tables functions directly to make it better visible which parts are shared between ip_tables and ip6_tables.
---
commit e784feead989b60588e60a2f584e22ae08804cec
tree e9c04f10f3b37823d949b0638a7f9d6c600bbb2c
parent ed4ff97f3d8c948c5ef177b80c1432e739fa0c94
author Jan Engelhardt <[email protected]> Tue, 06 Feb 2007 07:37:04 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:12 +0100
include/linux/netfilter_ipv4/ip_tables.h | 12 +----------- include/linux/netfilter_ipv6/ip6_tables.h | 10 ---------- net/ipv4/netfilter/ip_nat_rule.c | 26 ++++++++++++++------------ net/ipv4/netfilter/ip_tables.c | 20 ++++++++++---------- net/ipv4/netfilter/ipt_CLUSTERIP.c | 14 ++++++++------ net/ipv4/netfilter/ipt_ECN.c | 13 ++++++++----- net/ipv4/netfilter/ipt_LOG.c | 11 ++++++----- net/ipv4/netfilter/ipt_MASQUERADE.c | 9 +++++---- net/ipv4/netfilter/ipt_NETMAP.c | 8 +++++--- net/ipv4/netfilter/ipt_REDIRECT.c | 8 +++++--- net/ipv4/netfilter/ipt_REJECT.c | 10 ++++++---- net/ipv4/netfilter/ipt_SAME.c | 8 +++++--- net/ipv4/netfilter/ipt_TOS.c | 11 ++++++----- net/ipv4/netfilter/ipt_TTL.c | 11 ++++++----- net/ipv4/netfilter/ipt_ULOG.c | 13 ++++++------- net/ipv4/netfilter/ipt_addrtype.c | 9 +++++---- net/ipv4/netfilter/ipt_ah.c | 10 ++++++---- net/ipv4/netfilter/ipt_ecn.c | 10 +++++++--- net/ipv4/netfilter/ipt_iprange.c | 10 +++++----- net/ipv4/netfilter/ipt_owner.c | 9 +++++---- net/ipv4/netfilter/ipt_recent.c | 12 +++++++----- net/ipv4/netfilter/ipt_tos.c | 10 ++++++---- net/ipv4/netfilter/ipt_ttl.c | 11 ++++++----- net/ipv4/netfilter/nf_nat_rule.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 12 ++++++------ net/ipv6/netfilter/ip6t_HL.c | 14 ++++++++------ net/ipv6/netfilter/ip6t_LOG.c | 10 ++++++---- net/ipv6/netfilter/ip6t_REJECT.c | 10 ++++++---- net/ipv6/netfilter/ip6t_ah.c | 8 +++++--- net/ipv6/netfilter/ip6t_eui64.c | 8 +++++--- net/ipv6/netfilter/ip6t_frag.c | 8 +++++--- net/ipv6/netfilter/ip6t_hbh.c | 1 + net/ipv6/netfilter/ip6t_hl.c | 11 ++++++----- net/ipv6/netfilter/ip6t_ipv6header.c | 8 +++++--- net/ipv6/netfilter/ip6t_owner.c | 8 +++++--- net/ipv6/netfilter/ip6t_rt.c | 8 +++++--- 36 files changed, 202 insertions(+), 171 deletions(-)
include/linux/netfilter_ipv4/ip_tables.h +1 -11
@@ -272,16 +272,6 @@ #ifdef __KERNEL__#include <linux/init.h> extern void ipt_init (void )__init ; -#define ipt_register_target (tgt) \ -({ (tgt)->family = AF_INET; \ - xt_register_target(tgt); }) -#define ipt_unregister_target (tgt) xt_unregister_target(tgt) - -#define ipt_register_match (mtch) \ -({ (mtch)->family = AF_INET; \ - xt_register_match(mtch); }) -#define ipt_unregister_match (mtch) xt_unregister_match(mtch) -//#define ipt_register_table(tbl, repl) xt_register_table(AF_INET, tbl, repl) //#define ipt_unregister_table(tbl) xt_unregister_table(AF_INET, tbl)
@@ -290,7 +280,7 @@ extern int ipt_register_table(struct iptextern void ipt_unregister_table (struct ipt_table *table);/* net/sched/ipt.c: Gimme access to your targets! Gets target->me. */ -extern struct ipt_target *ipt_find_target (const char *name,u8 revision); +extern struct xt_target *ipt_find_target (const char *name,u8 revision);/* Standard entry. */ struct ipt_standard
include/linux/netfilter_ipv6/ip6_tables.h +0 -10
@@ -286,16 +286,6 @@ #ifdef __KERNEL__#include <linux/init.h> extern void ip6t_init (void )__init ; -#define ip6t_register_target (tgt) \ -({ (tgt)->family = AF_INET6; \ - xt_register_target(tgt); }) -#define ip6t_unregister_target (tgt) xt_unregister_target(tgt) - -#define ip6t_register_match (match) \ -({ (match)->family = AF_INET6; \ - xt_register_match(match); }) -#define ip6t_unregister_match (match) xt_unregister_match(match) -extern int ip6t_register_table (struct ip6t_table *table,const struct ip6t_replace *repl);extern void ip6t_unregister_table (struct ip6t_table *table);
net/ipv4/netfilter/ip_nat_rule.c +14 -12
@@ -99,7 +99,7 @@ static unsigned int ipt_snat_target(struconst struct net_device *in, const struct net_device *out, unsigned int hooknum, - const struct ipt_target *target, + const struct xt_target *target, const void *targinfo) { struct ip_conntrack *ct;
@@ -141,7 +141,7 @@ static unsigned int ipt_dnat_target(struconst struct net_device *in, const struct net_device *out, unsigned int hooknum, - const struct ipt_target *target, + const struct xt_target *target, const void *targinfo) { struct ip_conntrack *ct;
@@ -166,7 +166,7 @@ static unsigned int ipt_dnat_target(strustatic int ipt_snat_checkentry (const char *tablename,const void *entry, -const struct ipt_target *target, +const struct xt_target *target,void *targinfo,unsigned int hook_mask) {
@@ -182,7 +182,7 @@ static int ipt_snat_checkentry(const chastatic int ipt_dnat_checkentry (const char *tablename,const void *entry, -const struct ipt_target *target, +const struct xt_target *target,void *targinfo,unsigned int hook_mask) {
@@ -261,8 +261,9 @@ int ip_nat_rule_find(struct sk_buff **psreturn ret; } -static struct ipt_target ipt_snat_reg = { +static struct xt_target ipt_snat_reg = { .name ="SNAT" , + .family =AF_INET , .target = ipt_snat_target, .targetsize =sizeof (struct ip_nat_multi_range_compat ), .table ="nat" ,
@@ -270,8 +271,9 @@ static struct ipt_target ipt_snat_reg = .checkentry = ipt_snat_checkentry, }; -static struct ipt_target ipt_dnat_reg = { +static struct xt_target ipt_dnat_reg = { .name ="DNAT" , + .family =AF_INET , .target = ipt_dnat_target, .targetsize =sizeof (struct ip_nat_multi_range_compat ), .table ="nat" ,
@@ -286,27 +288,27 @@ int __init ip_nat_rule_init(void) ret =ipt_register_table (&nat_table, &nat_initial_table.repl);if (ret !=0 )return ret; - ret =ipt_register_target (&ipt_snat_reg); + ret =xt_register_target (&ipt_snat_reg);if (ret !=0 ) goto unregister_table; - ret =ipt_register_target (&ipt_dnat_reg); + ret =xt_register_target (&ipt_dnat_reg);if (ret !=0 ) goto unregister_snat;return ret; unregister_snat: -ipt_unregister_target (&ipt_snat_reg); +xt_unregister_target (&ipt_snat_reg); unregister_table: -ipt_unregister_table (&nat_table); +xt_unregister_table (&nat_table);return ret; }void ip_nat_rule_cleanup (void ) { -ipt_unregister_target (&ipt_dnat_reg); -ipt_unregister_target (&ipt_snat_reg); +xt_unregister_target (&ipt_dnat_reg); +xt_unregister_target (&ipt_snat_reg);ipt_unregister_table (&nat_table); }
net/ipv4/netfilter/ip_tables.c +10 -10
@@ -507,7 +507,7 @@ check_entry(struct ipt_entry *e, const cstatic inline int check_match (struct ipt_entry_match *m,const char *name,const struct ipt_ip *ip,unsigned int hookmask) { -struct ipt_match *match; +struct xt_match *match;int ret; match = m->u.kernel.match;
@@ -531,7 +531,7 @@ find_check_match(struct ipt_entry_matchunsigned int hookmask, unsigned int *i) { - struct ipt_match *match; + struct xt_match *match;int ret; match = try_then_request_module(xt_find_match(AF_INET, m->u.user.name,
@@ -557,7 +557,7 @@ err:static inline int check_target (struct ipt_entry *e,const char *name) {struct ipt_entry_target *t; -struct ipt_target *target; +struct xt_target *target;int ret; t =ipt_get_target (e);
@@ -580,7 +580,7 @@ find_check_entry(struct ipt_entry *e, co unsigned int *i) {struct ipt_entry_target *t; -struct ipt_target *target; +struct xt_target *target;int ret;unsigned int j;
@@ -1437,7 +1437,7 @@ compat_check_calc_match(struct ipt_entryunsigned int hookmask, int *size, int *i) { - struct ipt_match *match; + struct xt_match *match; match = try_then_request_module(xt_find_match(AF_INET, m->u.user.name, m->u.user.revision),
@@ -1466,7 +1466,7 @@ check_compat_entry_size_and_hooks(struct const char *name) {struct ipt_entry_target *t; -struct ipt_target *target; +struct xt_target *target;unsigned int entry_offset;int ret, off, h, j;
@@ -1550,7 +1550,7 @@ static int compat_copy_entry_from_user(s struct xt_table_info *newinfo, unsigned char *base) { struct ipt_entry_target *t; -struct ipt_target *target; +struct xt_target *target;struct ipt_entry *de;unsigned int origsize;int ret, h;
@@ -2124,7 +2124,7 @@ icmp_checkentry(const char *tablename, }/* The built-in targets: standard (NULL) and error. */ -static struct ipt_target ipt_standard_target = { +static struct xt_target ipt_standard_target = { .name =IPT_STANDARD_TARGET , .targetsize =sizeof (int ), .family =AF_INET ,
@@ -2135,7 +2135,7 @@ #ifdef CONFIG_COMPAT#endif }; -static struct ipt_target ipt_error_target = { +static struct xt_target ipt_error_target = { .name =IPT_ERROR_TARGET , .target = ipt_error, .targetsize =IPT_FUNCTION_MAXNAMELEN ,
@@ -2158,7 +2158,7 @@ #ifdef CONFIG_COMPAT#endif }; -static struct ipt_match icmp_matchstruct = { +static struct xt_match icmp_matchstruct = { .name ="icmp" , .match = icmp_match, .matchsize =sizeof (struct ipt_icmp ),
net/ipv4/netfilter/ipt_CLUSTERIP.c +8 -6
@@ -26,6 +26,7 @@ #include <net/checksum.h>#include <linux/netfilter_arp.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h> #include <net/netfilter/nf_conntrack_compat.h>
@@ -330,7 +331,7 @@ target(struct sk_buff **pskb,if ((*pskb)->nh.iph->protocol ==IPPROTO_ICMP && (ctinfo ==IP_CT_RELATED || ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY )) -return IPT_CONTINUE ; +return XT_CONTINUE ;/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO, * TIMESTAMP, INFO_REQUEST or ADDRESS type icmp packets from here
@@ -368,7 +369,7 @@ #endif* actually a unicast IP packet. TCP doesn't like PACKET_MULTICAST */ (*pskb)->pkt_type =PACKET_HOST ; -return IPT_CONTINUE ; +return XT_CONTINUE ; } static int
@@ -471,8 +472,9 @@ static void destroy(const struct xt_targnf_ct_l3proto_module_put (target->family); } -static struct ipt_target clusterip_tgt = { +static struct xt_target clusterip_tgt = { .name ="CLUSTERIP" , + .family =AF_INET , .target = target, .targetsize =sizeof (struct ipt_clusterip_tgt_info ), .checkentry = checkentry,
@@ -728,7 +730,7 @@ static int __init ipt_clusterip_init(voi {int ret; - ret =ipt_register_target (&clusterip_tgt); + ret =xt_register_target (&clusterip_tgt);if (ret <0 )return ret;
@@ -754,7 +756,7 @@ cleanup_hook:nf_unregister_hook (&cip_arp_ops);#endif /* CONFIG_PROC_FS */ cleanup_target: -ipt_unregister_target (&clusterip_tgt); +xt_unregister_target (&clusterip_tgt);return ret; }
@@ -766,7 +768,7 @@ #ifdef CONFIG_PROC_FSremove_proc_entry (clusterip_procdir->name, clusterip_procdir->parent);#endif nf_unregister_hook (&cip_arp_ops); -ipt_unregister_target (&clusterip_tgt); +xt_unregister_target (&clusterip_tgt); }module_init (ipt_clusterip_init);
net/ipv4/netfilter/ipt_ECN.c +8 -5
@@ -9,12 +9,14 @@* ipt_ECN.c,v 1.5 2002/08/18 19:36:51 laforge Exp */ +#include <linux/in.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h> #include <linux/tcp.h> #include <net/checksum.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_ECN.h>
@@ -95,7 +97,7 @@ target(struct sk_buff **pskb,if (!set_ect_tcp (pskb, einfo))return NF_DROP ; -return IPT_CONTINUE ; +return XT_CONTINUE ; } static int
@@ -119,7 +121,7 @@ checkentry(const char *tablename,return 0 ; }if ((einfo->operation & (IPT_ECN_OP_SET_ECE |IPT_ECN_OP_SET_CWR )) - && (e->ip.proto !=IPPROTO_TCP || (e->ip.invflags &IPT_INV_PROTO ))) { + && (e->ip.proto !=IPPROTO_TCP || (e->ip.invflags &XT_INV_PROTO ))) {printk (KERN_WARNING "ECN: cannot use TCP operations on a " "non-tcp rule\n" );return 0 ;
@@ -127,8 +129,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ipt_target ipt_ecn_reg = { +static struct xt_target ipt_ecn_reg = { .name ="ECN" , + .family =AF_INET , .target = target, .targetsize =sizeof (struct ipt_ECN_info ), .table ="mangle" ,
@@ -138,12 +141,12 @@ static struct ipt_target ipt_ecn_reg = {static int __init ipt_ecn_init (void ) { -return ipt_register_target (&ipt_ecn_reg); +return xt_register_target (&ipt_ecn_reg); } static void __exit ipt_ecn_fini(void) { -ipt_unregister_target (&ipt_ecn_reg); +xt_unregister_target (&ipt_ecn_reg); }module_init (ipt_ecn_init);
net/ipv4/netfilter/ipt_LOG.c +6 -5
@@ -20,7 +20,7 @@ #include <net/tcp.h>#include <net/route.h> #include <linux/netfilter.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_LOG.h> MODULE_LICENSE ("GPL" );
@@ -432,7 +432,7 @@ ipt_log_target(struct sk_buff **pskb,ipt_log_packet (PF_INET , hooknum, *pskb, in, out, &li, loginfo->prefix); -return IPT_CONTINUE ; +return XT_CONTINUE ; } static int ipt_log_checkentry(const char *tablename,
@@ -455,8 +455,9 @@ static int ipt_log_checkentry(const charreturn 1 ; } -static struct ipt_target ipt_log_reg = { +static struct xt_target ipt_log_reg = { .name ="LOG" , + .family =AF_INET , .target = ipt_log_target, .targetsize =sizeof (struct ipt_log_info ), .checkentry = ipt_log_checkentry,
@@ -473,7 +474,7 @@ static int __init ipt_log_init(void) {int ret; - ret =ipt_register_target (&ipt_log_reg); + ret =xt_register_target (&ipt_log_reg);if (ret <0 )return ret;if (nf_log_register (PF_INET , &ipt_log_logger) <0 ) {
@@ -489,7 +490,7 @@ static int __init ipt_log_init(void) static void __exit ipt_log_fini(void) {nf_log_unregister_logger (&ipt_log_logger); -ipt_unregister_target (&ipt_log_reg); +xt_unregister_target (&ipt_log_reg); }module_init (ipt_log_init);
net/ipv4/netfilter/ipt_MASQUERADE.c +5 -4
@@ -25,7 +25,7 @@ #include <net/netfilter/nf_nat_rule.h>#else #include <linux/netfilter_ipv4/ip_nat_rule.h> #endif -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Netfilter Core Team <[email protected]>" );
@@ -190,8 +190,9 @@ static struct notifier_block masq_inet_n .notifier_call = masq_inet_event, }; -static struct ipt_target masquerade = { +static struct xt_target masquerade = { .name ="MASQUERADE" , + .family =AF_INET , .target = masquerade_target, .targetsize =sizeof (struct ip_nat_multi_range_compat ), .table ="nat" ,
@@ -204,7 +205,7 @@ static int __init ipt_masquerade_init(vo {int ret; - ret =ipt_register_target (&masquerade); + ret =xt_register_target (&masquerade);if (ret ==0 ) {/* Register for device down reports */
@@ -218,7 +219,7 @@ static int __init ipt_masquerade_init(vo static void __exit ipt_masquerade_fini(void) { -ipt_unregister_target (&masquerade); +xt_unregister_target (&masquerade);unregister_netdevice_notifier (&masq_dev_notifier);unregister_inetaddr_notifier (&masq_inet_notifier); }
net/ipv4/netfilter/ipt_NETMAP.c +5 -3
@@ -15,6 +15,7 @@ #include <linux/module.h>#include <linux/netdevice.h> #include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> +#include <linux/netfilter/x_tables.h> #ifdef CONFIG_NF_NAT_NEEDED #include <net/netfilter/nf_nat_rule.h> #else
@@ -88,8 +89,9 @@ target(struct sk_buff **pskb,return ip_nat_setup_info (ct, &newrange, hooknum); } -static struct ipt_target target_module = { +static struct xt_target target_module = { .name =MODULENAME , + .family =AF_INET , .target = target, .targetsize =sizeof (struct ip_nat_multi_range_compat ), .table ="nat" ,
@@ -101,12 +103,12 @@ static struct ipt_target target_module =static int __init ipt_netmap_init (void ) { -return ipt_register_target (&target_module); +return xt_register_target (&target_module); } static void __exit ipt_netmap_fini(void) { -ipt_unregister_target (&target_module); +xt_unregister_target (&target_module); }module_init (ipt_netmap_init);
net/ipv4/netfilter/ipt_REDIRECT.c +5 -3
@@ -18,6 +18,7 @@ #include <linux/inetdevice.h>#include <net/protocol.h> #include <net/checksum.h> #include <linux/netfilter_ipv4.h> +#include <linux/netfilter/x_tables.h> #ifdef CONFIG_NF_NAT_NEEDED #include <net/netfilter/nf_nat_rule.h> #else
@@ -104,8 +105,9 @@ redirect_target(struct sk_buff **pskb,return ip_nat_setup_info (ct, &newrange, hooknum); } -static struct ipt_target redirect_reg = { +static struct xt_target redirect_reg = { .name ="REDIRECT" , + .family =AF_INET , .target = redirect_target, .targetsize =sizeof (struct ip_nat_multi_range_compat ), .table ="nat" ,
@@ -116,12 +118,12 @@ static struct ipt_target redirect_reg =static int __init ipt_redirect_init (void ) { -return ipt_register_target (&redirect_reg); +return xt_register_target (&redirect_reg); } static void __exit ipt_redirect_fini(void) { -ipt_unregister_target (&redirect_reg); +xt_unregister_target (&redirect_reg); }module_init (ipt_redirect_init);
net/ipv4/netfilter/ipt_REJECT.c +6 -4
@@ -22,6 +22,7 @@ #include <net/ip.h>#include <net/tcp.h> #include <net/route.h> #include <net/dst.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_REJECT.h> #ifdef CONFIG_BRIDGE_NETFILTER
@@ -230,7 +231,7 @@ static int check(const char *tablename, }else if (rejinfo->with ==IPT_TCP_RESET ) {/* Must specify that it's a TCP packet */ if (e->ip.proto !=IPPROTO_TCP - || (e->ip.invflags &IPT_INV_PROTO )) { + || (e->ip.invflags &XT_INV_PROTO )) {DEBUGP ("REJECT: TCP_RESET invalid for non-tcp\n" );return 0 ; }
@@ -238,8 +239,9 @@ static int check(const char *tablename,return 1 ; } -static struct ipt_target ipt_reject_reg = { +static struct xt_target ipt_reject_reg = { .name ="REJECT" , + .family =AF_INET , .target = reject, .targetsize =sizeof (struct ipt_reject_info ), .table ="filter" ,
@@ -251,12 +253,12 @@ static struct ipt_target ipt_reject_regstatic int __init ipt_reject_init (void ) { -return ipt_register_target (&ipt_reject_reg); +return xt_register_target (&ipt_reject_reg); } static void __exit ipt_reject_fini(void) { -ipt_unregister_target (&ipt_reject_reg); +xt_unregister_target (&ipt_reject_reg); }module_init (ipt_reject_init);
net/ipv4/netfilter/ipt_SAME.c +5 -3
@@ -34,6 +34,7 @@ #include <linux/inetdevice.h>#include <net/protocol.h> #include <net/checksum.h> #include <linux/netfilter_ipv4.h> +#include <linux/netfilter/x_tables.h> #ifdef CONFIG_NF_NAT_NEEDED #include <net/netfilter/nf_nat_rule.h> #else
@@ -186,8 +187,9 @@ #endifreturn ip_nat_setup_info (ct, &newrange, hooknum); } -static struct ipt_target same_reg = { +static struct xt_target same_reg = { .name ="SAME" , + .family =AF_INET , .target = same_target, .targetsize =sizeof (struct ipt_same_info ), .table ="nat" ,
@@ -199,12 +201,12 @@ static struct ipt_target same_reg = {static int __init ipt_same_init (void ) { -return ipt_register_target (&same_reg); +return xt_register_target (&same_reg); } static void __exit ipt_same_fini(void) { -ipt_unregister_target (&same_reg); +xt_unregister_target (&same_reg); }module_init (ipt_same_init);
net/ipv4/netfilter/ipt_TOS.c +6 -5
@@ -13,7 +13,7 @@ #include <linux/skbuff.h>#include <linux/ip.h> #include <net/checksum.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_TOS.h> MODULE_LICENSE ("GPL" );
@@ -40,7 +40,7 @@ target(struct sk_buff **pskb, iph->tos = (iph->tos &IPTOS_PREC_MASK ) | tosinfo->tos;nf_csum_replace2 (&iph->check,htons (oldtos),htons (iph->tos)); } -return IPT_CONTINUE ; +return XT_CONTINUE ; } static int
@@ -63,8 +63,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ipt_target ipt_tos_reg = { +static struct xt_target ipt_tos_reg = { .name ="TOS" , + .family =AF_INET , .target = target, .targetsize =sizeof (struct ipt_tos_target_info ), .table ="mangle" ,
@@ -74,12 +75,12 @@ static struct ipt_target ipt_tos_reg = {static int __init ipt_tos_init (void ) { -return ipt_register_target (&ipt_tos_reg); +return xt_register_target (&ipt_tos_reg); } static void __exit ipt_tos_fini(void) { -ipt_unregister_target (&ipt_tos_reg); +xt_unregister_target (&ipt_tos_reg); }module_init (ipt_tos_init);
net/ipv4/netfilter/ipt_TTL.c +6 -5
@@ -12,7 +12,7 @@ #include <linux/skbuff.h>#include <linux/ip.h> #include <net/checksum.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_TTL.h> MODULE_AUTHOR ("Harald Welte <[email protected]>" );
@@ -59,7 +59,7 @@ ipt_ttl_target(struct sk_buff **pskb, iph->ttl = new_ttl; } -return IPT_CONTINUE ; +return XT_CONTINUE ; } static int ipt_ttl_checkentry(const char *tablename,
@@ -80,8 +80,9 @@ static int ipt_ttl_checkentry(const charreturn 1 ; } -static struct ipt_target ipt_TTL = { +static struct xt_target ipt_TTL = { .name ="TTL" , + .family =AF_INET , .target = ipt_ttl_target, .targetsize =sizeof (struct ipt_TTL_info ), .table ="mangle" ,
@@ -91,12 +92,12 @@ static struct ipt_target ipt_TTL = {static int __init ipt_ttl_init (void ) { -return ipt_register_target (&ipt_TTL); +return xt_register_target (&ipt_TTL); } static void __exit ipt_ttl_fini(void) { -ipt_unregister_target (&ipt_TTL); +xt_unregister_target (&ipt_TTL); }module_init (ipt_ttl_init);
net/ipv4/netfilter/ipt_ULOG.c +6 -7
@@ -57,7 +57,7 @@ #include <linux/netdevice.h>#include <linux/mm.h> #include <linux/moduleparam.h> #include <linux/netfilter.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_ULOG.h> #include <net/sock.h> #include <linux/bitops.h>
@@ -132,7 +132,6 @@ static void ulog_send(unsigned int nlgro ub->qlen =0 ; ub->skb =NULL ; ub->lastnlh =NULL ; - }
@@ -314,7 +313,7 @@ static unsigned int ipt_ulog_target(struipt_ulog_packet (hooknum, *pskb, in, out, loginfo,NULL ); -return IPT_CONTINUE ; +return XT_CONTINUE ; } static void ipt_logfn(unsigned int pf,
@@ -363,8 +362,9 @@ static int ipt_ulog_checkentry(const chareturn 1 ; } -static struct ipt_target ipt_ulog_reg = { +static struct xt_target ipt_ulog_reg = { .name ="ULOG" , + .family =AF_INET , .target = ipt_ulog_target, .targetsize =sizeof (struct ipt_ulog_info ), .checkentry = ipt_ulog_checkentry,
@@ -400,7 +400,7 @@ static int __init ipt_ulog_init(void)if (!nflognl)return -ENOMEM ; - ret =ipt_register_target (&ipt_ulog_reg); + ret =xt_register_target (&ipt_ulog_reg);if (ret <0 ) {sock_release (nflognl->sk_socket);return ret;
@@ -420,7 +420,7 @@ static void __exit ipt_ulog_fini(void)if (nflog)nf_log_unregister_logger (&ipt_ulog_logger); -ipt_unregister_target (&ipt_ulog_reg); +xt_unregister_target (&ipt_ulog_reg);sock_release (nflognl->sk_socket);/* remove pending timers and free allocated skb's */
@@ -436,7 +436,6 @@ static void __exit ipt_ulog_fini(void) ub->skb =NULL ; } } - }module_init (ipt_ulog_init);
net/ipv4/netfilter/ipt_addrtype.c +5 -4
@@ -16,7 +16,7 @@ #include <linux/ip.h>#include <net/route.h> #include <linux/netfilter_ipv4/ipt_addrtype.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );
@@ -44,8 +44,9 @@ static int match(const struct sk_buff *sreturn ret; } -static struct ipt_match addrtype_match = { +static struct xt_match addrtype_match = { .name ="addrtype" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_addrtype_info ), .me =THIS_MODULE
@@ -53,12 +54,12 @@ static struct ipt_match addrtype_match =static int __init ipt_addrtype_init (void ) { -return ipt_register_match (&addrtype_match); +return xt_register_match (&addrtype_match); } static void __exit ipt_addrtype_fini(void) { -ipt_unregister_match (&addrtype_match); +xt_unregister_match (&addrtype_match); }module_init (ipt_addrtype_init);
net/ipv4/netfilter/ipt_ah.c +6 -4
@@ -6,12 +6,13 @@* published by the Free Software Foundation. */ +#include <linux/in.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h> #include <linux/netfilter_ipv4/ipt_ah.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Yon Uriarte <[email protected]>" );
@@ -86,8 +87,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ipt_match ah_match = { +static struct xt_match ah_match = { .name ="ah" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_ah ), .proto =IPPROTO_AH ,
@@ -97,12 +99,12 @@ static struct ipt_match ah_match = {static int __init ipt_ah_init (void ) { -return ipt_register_match (&ah_match); +return xt_register_match (&ah_match); } static void __exit ipt_ah_fini(void) { -ipt_unregister_match (&ah_match); +xt_unregister_match (&ah_match); }module_init (ipt_ah_init);
net/ipv4/netfilter/ipt_ecn.c +7 -3
@@ -9,10 +9,13 @@* published by the Free Software Foundation. */ +#include <linux/in.h> +#include <linux/ip.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/tcp.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_ecn.h>
@@ -109,8 +112,9 @@ static int checkentry(const char *tablenreturn 1 ; } -static struct ipt_match ecn_match = { +static struct xt_match ecn_match = { .name ="ecn" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_ecn_info ), .checkentry = checkentry,
@@ -119,12 +123,12 @@ static struct ipt_match ecn_match = {static int __init ipt_ecn_init (void ) { -return ipt_register_match (&ecn_match); +return xt_register_match (&ecn_match); } static void __exit ipt_ecn_fini(void) { -ipt_unregister_match (&ecn_match); +xt_unregister_match (&ecn_match); }module_init (ipt_ecn_init);
net/ipv4/netfilter/ipt_iprange.c +5 -5
@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_iprange.h> MODULE_LICENSE ("GPL" );
@@ -63,22 +63,22 @@ match(const struct sk_buff *skb,return 1 ; } -static struct ipt_match iprange_match = { +static struct xt_match iprange_match = { .name ="iprange" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_iprange_info ), - .destroy =NULL , .me =THIS_MODULE };static int __init ipt_iprange_init (void ) { -return ipt_register_match (&iprange_match); +return xt_register_match (&iprange_match); } static void __exit ipt_iprange_fini(void) { -ipt_unregister_match (&iprange_match); +xt_unregister_match (&iprange_match); }module_init (ipt_iprange_init);
net/ipv4/netfilter/ipt_owner.c +5 -4
@@ -15,7 +15,7 @@ #include <linux/rcupdate.h>#include <net/sock.h> #include <linux/netfilter_ipv4/ipt_owner.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Marc Boucher <[email protected]>" );
@@ -68,8 +68,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ipt_match owner_match = { +static struct xt_match owner_match = { .name ="owner" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_owner_info ), .hooks = (1 <<NF_IP_LOCAL_OUT ) | (1 <<NF_IP_POST_ROUTING ),
@@ -79,12 +80,12 @@ static struct ipt_match owner_match = {static int __init ipt_owner_init (void ) { -return ipt_register_match (&owner_match); +return xt_register_match (&owner_match); } static void __exit ipt_owner_fini(void) { -ipt_unregister_match (&owner_match); +xt_unregister_match (&owner_match); }module_init (ipt_owner_init);
net/ipv4/netfilter/ipt_recent.c +7 -5
@@ -12,6 +12,7 @@* Copyright 2002-2003, Stephen Frost, 2.5.x port by [email protected] */ #include <linux/init.h> +#include <linux/ip.h> #include <linux/moduleparam.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
@@ -24,7 +25,7 @@ #include <linux/bitops.h>#include <linux/skbuff.h> #include <linux/inet.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ipt_recent.h> MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );
@@ -462,8 +463,9 @@ static struct file_operations recent_fop };#endif /* CONFIG_PROC_FS */ -static struct ipt_match recent_match = { +static struct xt_match recent_match = { .name ="recent" , + .family =AF_INET , .match = ipt_recent_match, .matchsize =sizeof (struct ipt_recent_info ), .checkentry = ipt_recent_checkentry,
@@ -479,13 +481,13 @@ static int __init ipt_recent_init(void)return -EINVAL ; ip_list_hash_size =1 <<fls (ip_list_tot); - err =ipt_register_match (&recent_match); + err =xt_register_match (&recent_match);#ifdef CONFIG_PROC_FS if (err)return err; proc_dir =proc_mkdir ("ipt_recent" , proc_net);if (proc_dir ==NULL ) { -ipt_unregister_match (&recent_match); +xt_unregister_match (&recent_match); err = -ENOMEM ; }#endif
@@ -495,7 +497,7 @@ #endif static void __exit ipt_recent_exit(void) {BUG_ON (!list_empty (&tables)); -ipt_unregister_match (&recent_match); +xt_unregister_match (&recent_match);#ifdef CONFIG_PROC_FS remove_proc_entry ("ipt_recent" , proc_net);#endif
net/ipv4/netfilter/ipt_tos.c +6 -4
@@ -8,11 +8,12 @@* published by the Free Software Foundation. */ +#include <linux/ip.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter_ipv4/ipt_tos.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("iptables TOS match module" );
@@ -32,8 +33,9 @@ match(const struct sk_buff *skb,return (skb->nh.iph->tos == info->tos) ^ info->invert; } -static struct ipt_match tos_match = { +static struct xt_match tos_match = { .name ="tos" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_tos_info ), .me =THIS_MODULE ,
@@ -41,12 +43,12 @@ static struct ipt_match tos_match = {static int __init ipt_multiport_init (void ) { -return ipt_register_match (&tos_match); +return xt_register_match (&tos_match); } static void __exit ipt_multiport_fini(void) { -ipt_unregister_match (&tos_match); +xt_unregister_match (&tos_match); }module_init (ipt_multiport_init);
net/ipv4/netfilter/ipt_ttl.c +6 -5
@@ -9,11 +9,12 @@* published by the Free Software Foundation. */ +#include <linux/ip.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter_ipv4/ipt_ttl.h> -#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_DESCRIPTION ("IP tables TTL matching module" );
@@ -48,8 +49,9 @@ static int match(const struct sk_buff *sreturn 0 ; } -static struct ipt_match ttl_match = { +static struct xt_match ttl_match = { .name ="ttl" , + .family =AF_INET , .match = match, .matchsize =sizeof (struct ipt_ttl_info ), .me =THIS_MODULE ,
@@ -57,13 +59,12 @@ static struct ipt_match ttl_match = {static int __init ipt_ttl_init (void ) { -return ipt_register_match (&ttl_match); +return xt_register_match (&ttl_match); } static void __exit ipt_ttl_fini(void) { -ipt_unregister_match (&ttl_match); - +xt_unregister_match (&ttl_match); }module_init (ipt_ttl_init);
net/ipv4/netfilter/nf_nat_rule.c +1 -1
@@ -294,7 +294,7 @@ int nf_nat_rule_find(struct sk_buff **psreturn ret; } -static struct ipt_target ipt_snat_reg = { +static struct xt_target ipt_snat_reg = { .name ="SNAT" , .target = ipt_snat_target, .targetsize =sizeof (struct nf_nat_multi_range_compat ),
net/ipv6/netfilter/ip6_tables.c +6 -6
@@ -530,7 +530,7 @@ check_match(struct ip6t_entry_match *m,unsigned int hookmask, unsigned int *i) { - struct ip6t_match *match; + struct xt_match *match;int ret; match = try_then_request_module(xt_find_match(AF_INET6, m->u.user.name,
@@ -564,14 +564,14 @@ err:return ret; } -static struct ip6t_target ip6t_standard_target; +static struct xt_target ip6t_standard_target;static inline int check_entry (struct ip6t_entry *e,const char *name,unsigned int size,unsigned int *i) {struct ip6t_entry_target *t; -struct ip6t_target *target; +struct xt_target *target;int ret;unsigned int j;
@@ -1348,13 +1348,13 @@ icmp6_checkentry(const char *tablename, }/* The built-in targets: standard (NULL) and error. */ -static struct ip6t_target ip6t_standard_target = { +static struct xt_target ip6t_standard_target = { .name =IP6T_STANDARD_TARGET , .targetsize =sizeof (int ), .family =AF_INET6 , }; -static struct ip6t_target ip6t_error_target = { +static struct xt_target ip6t_error_target = { .name =IP6T_ERROR_TARGET , .target = ip6t_error, .targetsize =IP6T_FUNCTION_MAXNAMELEN ,
@@ -1371,7 +1371,7 @@ static struct nf_sockopt_ops ip6t_sockop .get = do_ip6t_get_ctl, }; -static struct ip6t_match icmp6_matchstruct = { +static struct xt_match icmp6_matchstruct = { .name ="icmp6" , .match = &icmp6_match, .matchsize =sizeof (struct ip6t_icmp ),
net/ipv6/netfilter/ip6t_HL.c +8 -6
@@ -9,12 +9,13 @@#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h> +#include <linux/ipv6.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6t_HL.h> MODULE_AUTHOR ("Maciej Soltysiak <[email protected]>" ); -MODULE_DESCRIPTION ("IP tables Hop Limit modification module" ); +MODULE_DESCRIPTION ("IP6 tables Hop Limit modification module" );MODULE_LICENSE ("GPL" ); static unsigned int ip6t_hl_target(struct sk_buff **pskb,
@@ -54,7 +55,7 @@ static unsigned int ip6t_hl_target(struc ip6h->hop_limit = new_hl; -return IP6T_CONTINUE ; +return XT_CONTINUE ; } static int ip6t_hl_checkentry(const char *tablename,
@@ -78,8 +79,9 @@ static int ip6t_hl_checkentry(const charreturn 1 ; } -static struct ip6t_target ip6t_HL = { +static struct xt_target ip6t_HL = { .name ="HL" , + .family =AF_INET6 , .target = ip6t_hl_target, .targetsize =sizeof (struct ip6t_HL_info ), .table ="mangle" ,
@@ -89,12 +91,12 @@ static struct ip6t_target ip6t_HL = {static int __init ip6t_hl_init (void ) { -return ip6t_register_target (&ip6t_HL); +return xt_register_target (&ip6t_HL); } static void __exit ip6t_hl_fini(void) { -ip6t_unregister_target (&ip6t_HL); +xt_unregister_target (&ip6t_HL); }module_init (ip6t_hl_init);
net/ipv6/netfilter/ip6t_LOG.c +6 -4
@@ -21,6 +21,7 @@ #include <net/udp.h>#include <net/tcp.h> #include <net/ipv6.h> #include <linux/netfilter.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> MODULE_AUTHOR ("Jan Rekorajski <[email protected]>" );
@@ -442,7 +443,7 @@ ip6t_log_target(struct sk_buff **pskb,ip6t_log_packet (PF_INET6 , hooknum, *pskb, in, out, &li, loginfo->prefix); -return IP6T_CONTINUE ; +return XT_CONTINUE ; }
@@ -466,8 +467,9 @@ static int ip6t_log_checkentry(const chareturn 1 ; } -static struct ip6t_target ip6t_log_reg = { +static struct xt_target ip6t_log_reg = { .name ="LOG" , + .family =AF_INET6 , .target = ip6t_log_target, .targetsize =sizeof (struct ip6t_log_info ), .checkentry = ip6t_log_checkentry,
@@ -484,7 +486,7 @@ static int __init ip6t_log_init(void) {int ret; - ret =ip6t_register_target (&ip6t_log_reg); + ret =xt_register_target (&ip6t_log_reg);if (ret <0 )return ret;if (nf_log_register (PF_INET6 , &ip6t_logger) <0 ) {
@@ -500,7 +502,7 @@ static int __init ip6t_log_init(void) static void __exit ip6t_log_fini(void) {nf_log_unregister_logger (&ip6t_logger); -ip6t_unregister_target (&ip6t_log_reg); +xt_unregister_target (&ip6t_log_reg); }module_init (ip6t_log_init);
net/ipv6/netfilter/ip6t_REJECT.c +6 -4
@@ -26,6 +26,7 @@ #include <net/ip6_checksum.h>#include <net/ip6_fib.h> #include <net/ip6_route.h> #include <net/flow.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_REJECT.h>
@@ -234,7 +235,7 @@ static int check(const char *tablename, }else if (rejinfo->with ==IP6T_TCP_RESET ) {/* Must specify that it's a TCP packet */ if (e->ipv6.proto !=IPPROTO_TCP - || (e->ipv6.invflags &IP6T_INV_PROTO )) { + || (e->ipv6.invflags &XT_INV_PROTO )) {DEBUGP ("ip6t_REJECT: TCP_RESET illegal for non-tcp\n" );return 0 ; }
@@ -242,8 +243,9 @@ static int check(const char *tablename,return 1 ; } -static struct ip6t_target ip6t_reject_reg = { +static struct xt_target ip6t_reject_reg = { .name ="REJECT" , + .family =AF_INET6 , .target = reject6_target, .targetsize =sizeof (struct ip6t_reject_info ), .table ="filter" ,
@@ -255,12 +257,12 @@ static struct ip6t_target ip6t_reject_restatic int __init ip6t_reject_init (void ) { -return ip6t_register_target (&ip6t_reject_reg); +return xt_register_target (&ip6t_reject_reg); } static void __exit ip6t_reject_fini(void) { -ip6t_unregister_target (&ip6t_reject_reg); +xt_unregister_target (&ip6t_reject_reg); }module_init (ip6t_reject_init);
net/ipv6/netfilter/ip6t_ah.c +5 -3
@@ -15,6 +15,7 @@ #include <linux/types.h>#include <net/checksum.h> #include <net/ipv6.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_ah.h>
@@ -118,8 +119,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ip6t_match ah_match = { +static struct xt_match ah_match = { .name ="ah" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (struct ip6t_ah ), .checkentry = checkentry,
@@ -128,12 +130,12 @@ static struct ip6t_match ah_match = {static int __init ip6t_ah_init (void ) { -return ip6t_register_match (&ah_match); +return xt_register_match (&ah_match); } static void __exit ip6t_ah_fini(void) { -ip6t_unregister_match (&ah_match); +xt_unregister_match (&ah_match); }module_init (ip6t_ah_init);
net/ipv6/netfilter/ip6t_eui64.c +5 -3
@@ -12,6 +12,7 @@ #include <linux/skbuff.h>#include <linux/ipv6.h> #include <linux/if_ether.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> MODULE_DESCRIPTION ("IPv6 EUI64 address checking match" );
@@ -61,8 +62,9 @@ match(const struct sk_buff *skb,return 0 ; } -static struct ip6t_match eui64_match = { +static struct xt_match eui64_match = { .name ="eui64" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (int ), .hooks = (1 << NF_IP6_PRE_ROUTING) | (1 << NF_IP6_LOCAL_IN) |
@@ -72,12 +74,12 @@ static struct ip6t_match eui64_match = {static int __init ip6t_eui64_init (void ) { -return ip6t_register_match (&eui64_match); +return xt_register_match (&eui64_match); } static void __exit ip6t_eui64_fini(void) { -ip6t_unregister_match (&eui64_match); +xt_unregister_match (&eui64_match); }module_init (ip6t_eui64_init);
net/ipv6/netfilter/ip6t_frag.c +5 -3
@@ -14,6 +14,7 @@ #include <linux/types.h>#include <net/checksum.h> #include <net/ipv6.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_frag.h>
@@ -135,8 +136,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ip6t_match frag_match = { +static struct xt_match frag_match = { .name ="frag" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (struct ip6t_frag ), .checkentry = checkentry,
@@ -145,12 +147,12 @@ static struct ip6t_match frag_match = {static int __init ip6t_frag_init (void ) { -return ip6t_register_match (&frag_match); +return xt_register_match (&frag_match); } static void __exit ip6t_frag_fini(void) { -ip6t_unregister_match (&frag_match); +xt_unregister_match (&frag_match); }module_init (ip6t_frag_init);
net/ipv6/netfilter/ip6t_hbh.c +1 -0
@@ -16,6 +16,7 @@ #include <net/ipv6.h>#include <asm/byteorder.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_opts.h>
net/ipv6/netfilter/ip6t_hl.c +6 -5
@@ -8,11 +8,12 @@* published by the Free Software Foundation. */ +#include <linux/ipv6.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter_ipv6/ip6t_hl.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_AUTHOR ("Maciej Soltysiak <[email protected]>" );MODULE_DESCRIPTION ("IP tables Hop Limit matching module" );
@@ -48,8 +49,9 @@ static int match(const struct sk_buff *sreturn 0 ; } -static struct ip6t_match hl_match = { +static struct xt_match hl_match = { .name ="hl" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (struct ip6t_hl_info ), .me =THIS_MODULE ,
@@ -57,13 +59,12 @@ static struct ip6t_match hl_match = {static int __init ip6t_hl_init (void ) { -return ip6t_register_match (&hl_match); +return xt_register_match (&hl_match); } static void __exit ip6t_hl_fini(void) { -ip6t_unregister_match (&hl_match); - +xt_unregister_match (&hl_match); }module_init (ip6t_hl_init);
net/ipv6/netfilter/ip6t_ipv6header.c +5 -3
@@ -18,6 +18,7 @@ #include <linux/types.h>#include <net/checksum.h> #include <net/ipv6.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
@@ -140,8 +141,9 @@ ipv6header_checkentry(const char *tablenreturn 1 ; } -static struct ip6t_match ip6t_ipv6header_match = { +static struct xt_match ip6t_ipv6header_match = { .name ="ipv6header" , + .family =AF_INET6 , .match = &ipv6header_match, .matchsize =sizeof (struct ip6t_ipv6header_info ), .checkentry = &ipv6header_checkentry,
@@ -151,12 +153,12 @@ static struct ip6t_match ip6t_ipv6headerstatic int __init ipv6header_init (void ) { -return ip6t_register_match (&ip6t_ipv6header_match); +return xt_register_match (&ip6t_ipv6header_match); } static void __exit ipv6header_exit(void) { -ip6t_unregister_match (&ip6t_ipv6header_match); +xt_unregister_match (&ip6t_ipv6header_match); }module_init (ipv6header_init);
net/ipv6/netfilter/ip6t_owner.c +5 -3
@@ -16,6 +16,7 @@ #include <net/sock.h>#include <linux/netfilter_ipv6/ip6t_owner.h> #include <linux/netfilter_ipv6/ip6_tables.h> +#include <linux/netfilter/x_tables.h> MODULE_AUTHOR ("Marc Boucher <[email protected]>" );MODULE_DESCRIPTION ("IP6 tables owner matching module" );
@@ -69,8 +70,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ip6t_match owner_match = { +static struct xt_match owner_match = { .name ="owner" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (struct ip6t_owner_info ), .hooks = (1 <<NF_IP6_LOCAL_OUT ) | (1 <<NF_IP6_POST_ROUTING ),
@@ -80,12 +82,12 @@ static struct ip6t_match owner_match = {static int __init ip6t_owner_init (void ) { -return ip6t_register_match (&owner_match); +return xt_register_match (&owner_match); } static void __exit ip6t_owner_fini(void) { -ip6t_unregister_match (&owner_match); +xt_unregister_match (&owner_match); }module_init (ip6t_owner_init);
net/ipv6/netfilter/ip6t_rt.c +5 -3
@@ -16,6 +16,7 @@ #include <net/ipv6.h>#include <asm/byteorder.h> +#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_rt.h>
@@ -221,8 +222,9 @@ checkentry(const char *tablename,return 1 ; } -static struct ip6t_match rt_match = { +static struct xt_match rt_match = { .name ="rt" , + .family =AF_INET6 , .match = match, .matchsize =sizeof (struct ip6t_rt ), .checkentry = checkentry,
@@ -231,12 +233,12 @@ static struct ip6t_match rt_match = {static int __init ip6t_rt_init (void ) { -return ip6t_register_match (&rt_match); +return xt_register_match (&rt_match); } static void __exit ip6t_rt_fini(void) { -ip6t_unregister_match (&rt_match); +xt_unregister_match (&rt_match); }module_init (ip6t_rt_init);
PATCH 12/15 : {ip, ip6}_tables: use struct xt_table instead of redefined structure names
In reply to Patrick McHardy[NETFILTER]: {ip,ip6}_tables: use struct xt_table instead of redefined structure names
---
commit 23ef10d3c0fcfacd86d3e566ba55504ea6de8a74
tree 9c835ce4d97f426523219fe33b801a4cde0cc19b
parent e784feead989b60588e60a2f584e22ae08804cec
author Jan Engelhardt <[email protected]> Tue, 06 Feb 2007 07:37:06 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:12 +0100
include/linux/netfilter_ipv4/ip_tables.h | 9 +++------ include/linux/netfilter_ipv6/ip6_tables.h | 6 +++--- net/ipv4/netfilter/ip_nat_rule.c | 2 +- net/ipv4/netfilter/ip_tables.c | 20 ++++++++++---------- net/ipv4/netfilter/iptable_filter.c | 2 +- net/ipv4/netfilter/iptable_mangle.c | 2 +- net/ipv4/netfilter/iptable_raw.c | 2 +- net/ipv4/netfilter/nf_nat_rule.c | 2 +- net/ipv6/netfilter/ip6table_filter.c | 2 +- net/ipv6/netfilter/ip6table_mangle.c | 2 +- net/sched/act_ipt.c | 2 +- 11 files changed, 24 insertions(+), 27 deletions(-)
include/linux/netfilter_ipv4/ip_tables.h +3 -6
@@ -272,12 +272,9 @@ #ifdef __KERNEL__#include <linux/init.h> extern void ipt_init (void )__init ; -//#define ipt_register_table(tbl, repl) xt_register_table(AF_INET, tbl, repl) -//#define ipt_unregister_table(tbl) xt_unregister_table(AF_INET, tbl) - -extern int ipt_register_table (struct ipt_table *table, +extern int ipt_register_table (struct xt_table *table,const struct ipt_replace *repl); -extern void ipt_unregister_table (struct ipt_table *table); +extern void ipt_unregister_table (struct xt_table *table);/* net/sched/ipt.c: Gimme access to your targets! Gets target->me. */ extern struct xt_target *ipt_find_target (const char *name,u8 revision);
@@ -305,7 +302,7 @@ extern unsigned int ipt_do_table(structunsigned int hook, const struct net_device *in, const struct net_device *out, - struct ipt_table *table); + struct xt_table *table);#define IPT_ALIGN (s) XT_ALIGN(s)
include/linux/netfilter_ipv6/ip6_tables.h +3 -3
@@ -286,14 +286,14 @@ #ifdef __KERNEL__#include <linux/init.h> extern void ip6t_init (void )__init ; -extern int ip6t_register_table (struct ip6t_table *table, +extern int ip6t_register_table (struct xt_table *table,const struct ip6t_replace *repl); -extern void ip6t_unregister_table (struct ip6t_table *table); +extern void ip6t_unregister_table (struct xt_table *table);extern unsigned int ip6t_do_table (struct sk_buff **pskb,unsigned int hook,const struct net_device *in,const struct net_device *out, -struct ip6t_table *table); +struct xt_table *table);/* Check for an extension */ extern int ip6t_ext_hdr (u8 nexthdr);
net/ipv4/netfilter/ip_nat_rule.c +1 -1
@@ -86,7 +86,7 @@ static struct } }; -static struct ipt_table nat_table = { +static struct xt_table nat_table = { .name ="nat" , .valid_hooks =NAT_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv4/netfilter/ip_tables.c +10 -10
@@ -216,7 +216,7 @@ ipt_do_table(struct sk_buff **pskb,unsigned int hook, const struct net_device *in, const struct net_device *out, - struct ipt_table *table) + struct xt_table *table) { static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));u_int16_t offset;
@@ -818,7 +818,7 @@ get_counters(const struct xt_table_info } } -static inline struct xt_counters *alloc_counters (struct ipt_table *table) +static inline struct xt_counters *alloc_counters (struct xt_table *table) {unsigned int countersize;struct xt_counters *counters;
@@ -843,7 +843,7 @@ static inline struct xt_counters * allocstatic int copy_entries_to_user (unsigned int total_size, -struct ipt_table *table, +struct xt_table *table,void __user *userptr) {unsigned int off, num;
@@ -1046,7 +1046,7 @@ #endifstatic int get_info (void __user *user,int *len,int compat) {char name[IPT_TABLE_MAXNAMELEN ]; -struct ipt_table *t; +struct xt_table *t;int ret;if (*len !=sizeof (struct ipt_getinfo )) {
@@ -1107,7 +1107,7 @@ get_entries(struct ipt_get_entries __use {int ret;struct ipt_get_entries get; -struct ipt_table *t; +struct xt_table *t;if (*len <sizeof (get)) { duprintf("get_entries: %u < %d\n", *len,
@@ -1151,7 +1151,7 @@ __do_replace(const char *name, unsigned void __user *counters_ptr) {int ret; -struct ipt_table *t; +struct xt_table *t;struct xt_table_info *oldinfo;struct xt_counters *counters;void *loc_cpu_old_entry;
@@ -1302,7 +1302,7 @@ do_add_counters(void __user *user, unsigchar *name;int size;void *ptmp; -struct ipt_table *t; +struct xt_table *t;struct xt_table_info *private;int ret =0 ;void *loc_cpu_entry;
@@ -1795,7 +1795,7 @@ struct compat_ipt_get_entries };static int compat_copy_entries_to_user (unsigned int total_size, -struct ipt_table *table,void __user *userptr) +struct xt_table *table,void __user *userptr) {unsigned int off, num;struct compat_ipt_entry e;
@@ -1869,7 +1869,7 @@ compat_get_entries(struct compat_ipt_get {int ret;struct compat_ipt_get_entries get; -struct ipt_table *t; +struct xt_table *t;if (*len <sizeof (get)) {
@@ -2052,7 +2052,7 @@ int ipt_register_table(struct xt_table *return 0 ; } -void ipt_unregister_table (struct ipt_table *table) +void ipt_unregister_table (struct xt_table *table) {struct xt_table_info *private;void *loc_cpu_entry;
net/ipv4/netfilter/iptable_filter.c +1 -1
@@ -74,7 +74,7 @@ static struct } }; -static struct ipt_table packet_filter = { +static struct xt_table packet_filter = { .name ="filter" , .valid_hooks =FILTER_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv4/netfilter/iptable_mangle.c +1 -1
@@ -103,7 +103,7 @@ static struct } }; -static struct ipt_table packet_mangler = { +static struct xt_table packet_mangler = { .name ="mangle" , .valid_hooks =MANGLE_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv4/netfilter/iptable_raw.c +1 -1
@@ -79,7 +79,7 @@ static struct } }; -static struct ipt_table packet_raw = { +static struct xt_table packet_raw = { .name ="raw" , .valid_hooks =RAW_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv4/netfilter/nf_nat_rule.c +1 -1
@@ -119,7 +119,7 @@ static struct } }; -static struct ipt_table nat_table = { +static struct xt_table nat_table = { .name ="nat" , .valid_hooks =NAT_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv6/netfilter/ip6table_filter.c +1 -1
@@ -92,7 +92,7 @@ static struct } }; -static struct ip6t_table packet_filter = { +static struct xt_table packet_filter = { .name ="filter" , .valid_hooks =FILTER_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/ipv6/netfilter/ip6table_mangle.c +1 -1
@@ -122,7 +122,7 @@ static struct } }; -static struct ip6t_table packet_mangler = { +static struct xt_table packet_mangler = { .name ="mangle" , .valid_hooks =MANGLE_VALID_HOOKS , .lock =RW_LOCK_UNLOCKED ,
net/sched/act_ipt.c +1 -1
@@ -52,7 +52,7 @@ static struct tcf_hashinfo ipt_hash_infostatic int ipt_init_target (struct ipt_entry_target *t,char *table,unsigned int hook) { -struct ipt_target *target; +struct xt_target *target;int ret =0 ; target = xt_request_find_target(AF_INET, t->u.user.name,
PATCH 13/15 : ip6_tables: support MH match
In reply to Patrick McHardy[NETFILTER]: ip6_tables: support MH match
This introduces match for Mobility Header (MH) described by Mobile IPv6 specification (RFC3775). User can specify the MH type or its range to be matched.
---
commit 5a5812610d318df713ca8b2a63894ceafc503441
tree 98373ccceea06243d766d69903005fa6448cadb9
parent 23ef10d3c0fcfacd86d3e566ba55504ea6de8a74
author Masahide NAKAMURA <[email protected]> Tue, 06 Feb 2007 07:37:08 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:13 +0100
include/linux/netfilter_ipv6/ip6t_mh.h | 15 ++++ net/ipv6/netfilter/Kconfig | 8 ++ net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/ip6t_mh.c | 108 ++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 0 deletions(-)
include/linux/netfilter_ipv6/ip6t_mh.h new file +15 -0
@@ -0,0 +1,15 @@ +#ifndef _IP6T_MH_H +#define _IP6T_MH_H + +/* MH matching stuff */ +struct ip6t_mh +{ +u_int8_t types[2 ];/* MH type range */ +u_int8_t invflags;/* Inverse flags */ +}; + +/* Values for "invflags" field in struct ip6t_mh. */ +#define IP6T_MH_INV_TYPE 0x01/* Invert the sense of type. */ +#define IP6T_MH_INV_MASK 0x01/* All possible flags. */ + +#endif /*_IP6T_MH_H*/
net/ipv6/netfilter/Kconfig +8 -0
@@ -114,6 +114,14 @@ config IP6_NF_MATCH_AH To compile it as a module, choose M here. If unsure, say N. +config IP6_NF_MATCH_MH + tristate "MH match support" + depends on IP6_NF_IPTABLES + help + This module allows one to match MH packets. + + To compile it as a module, choose M here. If unsure, say N. + config IP6_NF_MATCH_EUI64 tristate "EUI64 address check" depends on IP6_NF_IPTABLES
net/ipv6/netfilter/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o +obj-$(CONFIG_IP6_NF_MATCH_MH) += ip6t_mh.o # objects for l3 independent conntrack nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o nf_conntrack_reasm.o
net/ipv6/netfilter/ip6t_mh.c new file +108 -0
108 lines not on this page · raw message
PATCH 14/15 : ip_tables: remove declaration of non-existant ipt_find_target function
In reply to Patrick McHardy[NETFILTER]: ip_tables: remove declaration of non-existant ipt_find_target function
---
commit 86f832bd66647a6001f2cc345c4b62f8491bc2c2
tree 5b84eea376220d76faedd4e75f8e5a4452c1e864
parent 5a5812610d318df713ca8b2a63894ceafc503441
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:13 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:13 +0100
include/linux/netfilter_ipv4/ip_tables.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
include/linux/netfilter_ipv4/ip_tables.h +0 -3
@@ -276,9 +276,6 @@ extern int ipt_register_table(struct xt_ const struct ipt_replace *repl);extern void ipt_unregister_table (struct xt_table *table); -/* net/sched/ipt.c: Gimme access to your targets! Gets target->me. */ -extern struct xt_target *ipt_find_target (const char *name,u8 revision); -/* Standard entry. */ struct ipt_standard {
PATCH 15/15 : ip6_tables: remove redundant structure definitions
In reply to Patrick McHardy[NETFILTER]: ip6_tables: remove redundant structure definitions
Move ip6t_standard/ip6t_error_target/ip6t_error definitions to ip6_tables.h instead of defining them in each table individually.
---
commit 7e5c95832a67b0181f395669002e2346173e4866
tree cb59a3637401b5fd807daf02dafbb5aa05c197af
parent 86f832bd66647a6001f2cc345c4b62f8491bc2c2
author Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:14 +0100 committer Patrick McHardy <[email protected]> Tue, 06 Feb 2007 08:53:14 +0100
include/linux/netfilter_ipv6/ip6_tables.h | 19 +++++++++++++++++++ net/ipv6/netfilter/ip6table_filter.c | 19 ------------------- net/ipv6/netfilter/ip6table_mangle.c | 19 ------------------- net/ipv6/netfilter/ip6table_raw.c | 19 ------------------- 4 files changed, 19 insertions(+), 57 deletions(-)
include/linux/netfilter_ipv6/ip6_tables.h +19 -0
@@ -104,6 +104,25 @@ struct ip6t_entryunsigned char elems[0 ]; }; +/* Standard entry */ +struct ip6t_standard +{ +struct ip6t_entry entry; +struct ip6t_standard_target target; +}; + +struct ip6t_error_target +{ +struct ip6t_entry_target target; +char errorname[IP6T_FUNCTION_MAXNAMELEN ]; +}; + +struct ip6t_error +{ +struct ip6t_entry entry; +struct ip6t_error_target target; +}; +/* * New IP firewall options for [gs]etsockopt at the RAW IP level. * Unlike BSD Linux inherits IP options so you don't have to use
net/ipv6/netfilter/ip6table_filter.c +0 -19
@@ -19,25 +19,6 @@ MODULE_DESCRIPTION("ip6tables filter tab#define FILTER_VALID_HOOKS ((1 << NF_IP6_LOCAL_IN) | (1 << NF_IP6_FORWARD) | (1 << NF_IP6_LOCAL_OUT)) -/* Standard entry. */ -struct ip6t_standard -{ -struct ip6t_entry entry; -struct ip6t_standard_target target; -}; - -struct ip6t_error_target -{ -struct ip6t_entry_target target; -char errorname[IP6T_FUNCTION_MAXNAMELEN ]; -}; - -struct ip6t_error -{ -struct ip6t_entry entry; -struct ip6t_error_target target; -}; - static struct { struct ip6t_replace repl;
net/ipv6/netfilter/ip6table_mangle.c +0 -19
@@ -29,25 +29,6 @@ #else #define DEBUGP(x, args...)#endif -/* Standard entry. */ -struct ip6t_standard -{ -struct ip6t_entry entry; -struct ip6t_standard_target target; -}; - -struct ip6t_error_target -{ -struct ip6t_entry_target target; -char errorname[IP6T_FUNCTION_MAXNAMELEN ]; -}; - -struct ip6t_error -{ -struct ip6t_entry entry; -struct ip6t_error_target target; -}; - static struct { struct ip6t_replace repl;
net/ipv6/netfilter/ip6table_raw.c +0 -19
@@ -14,25 +14,6 @@ #else #define DEBUGP(x, args...)#endif -/* Standard entry. */ -struct ip6t_standard -{ -struct ip6t_entry entry; -struct ip6t_standard_target target; -}; - -struct ip6t_error_target -{ -struct ip6t_entry_target target; -char errorname[IP6T_FUNCTION_MAXNAMELEN ]; -}; - -struct ip6t_error -{ -struct ip6t_entry entry; -struct ip6t_error_target target; -}; - static struct { struct ip6t_replace repl;