From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: [PATCH 2.6 5/6]: move ipt_error and ipt_standard to iptables.h Date: Tue, 11 Jan 2005 13:49:56 +0100 Message-ID: <41E3CB74.5040907@trash.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080107070708050100090405" Cc: Netfilter Development Mailinglist Return-path: To: "David S. Miller" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org This is a multi-part message in MIME format. --------------080107070708050100090405 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit --------------080107070708050100090405 Content-Type: text/x-patch; name="05.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="05.diff" # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/01/11 03:45:03+01:00 pablo@eurodev.net # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/iptable_raw.c # 2005/01/11 03:44:54+01:00 pablo@eurodev.net +0 -19 # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/iptable_mangle.c # 2005/01/11 03:44:54+01:00 pablo@eurodev.net +0 -19 # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/iptable_filter.c # 2005/01/11 03:44:54+01:00 pablo@eurodev.net +0 -19 # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # # net/ipv4/netfilter/ip_nat_rule.c # 2005/01/11 03:44:54+01:00 pablo@eurodev.net +0 -19 # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # # include/linux/netfilter_ipv4/ip_tables.h # 2005/01/11 03:44:54+01:00 pablo@eurodev.net +19 -0 # [NETFILTER]: move ipt_error and ipt_standard to iptables.h # # Signed-off-by: Pablo Neira Ayuso # Signed-off-by: Patrick McHardy # diff -Nru a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h --- a/include/linux/netfilter_ipv4/ip_tables.h 2005-01-11 13:39:58 +01:00 +++ b/include/linux/netfilter_ipv4/ip_tables.h 2005-01-11 13:39:58 +01:00 @@ -459,6 +459,25 @@ /* net/sched/ipt.c: Gimme access to your targets! Gets target->me. */ extern struct ipt_target *ipt_find_target(const char *name, u8 revision); +/* Standard entry. */ +struct ipt_standard +{ + struct ipt_entry entry; + struct ipt_standard_target target; +}; + +struct ipt_error_target +{ + struct ipt_entry_target target; + char errorname[IPT_FUNCTION_MAXNAMELEN]; +}; + +struct ipt_error +{ + struct ipt_entry entry; + struct ipt_error_target target; +}; + extern int ipt_register_table(struct ipt_table *table); extern void ipt_unregister_table(struct ipt_table *table); extern unsigned int ipt_do_table(struct sk_buff **pskb, diff -Nru a/net/ipv4/netfilter/ip_nat_rule.c b/net/ipv4/netfilter/ip_nat_rule.c --- a/net/ipv4/netfilter/ip_nat_rule.c 2005-01-11 13:39:58 +01:00 +++ b/net/ipv4/netfilter/ip_nat_rule.c 2005-01-11 13:39:58 +01:00 @@ -35,25 +35,6 @@ #define NAT_VALID_HOOKS ((1<