* [PATCH 2.6 5/6]: move ipt_error and ipt_standard to iptables.h
@ 2005-01-11 12:49 Patrick McHardy
0 siblings, 0 replies; only message in thread
From: Patrick McHardy @ 2005-01-11 12:49 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 05.diff --]
[-- Type: text/x-patch, Size: 5369 bytes --]
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# 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 <pablo@eurodev.net>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
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<<NF_IP_PRE_ROUTING) | (1<<NF_IP_POST_ROUTING) | (1<<NF_IP_LOCAL_OUT))
-/* 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;
-};
-
static struct
{
struct ipt_replace repl;
diff -Nru a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c
--- a/net/ipv4/netfilter/iptable_filter.c 2005-01-11 13:39:58 +01:00
+++ b/net/ipv4/netfilter/iptable_filter.c 2005-01-11 13:39:58 +01:00
@@ -20,25 +20,6 @@
#define FILTER_VALID_HOOKS ((1 << NF_IP_LOCAL_IN) | (1 << NF_IP_FORWARD) | (1 << NF_IP_LOCAL_OUT))
-/* 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;
-};
-
static struct
{
struct ipt_replace repl;
diff -Nru a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c
--- a/net/ipv4/netfilter/iptable_mangle.c 2005-01-11 13:39:58 +01:00
+++ b/net/ipv4/netfilter/iptable_mangle.c 2005-01-11 13:39:58 +01:00
@@ -29,25 +29,6 @@
(1 << NF_IP_LOCAL_OUT) | \
(1 << NF_IP_POST_ROUTING))
-/* 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;
-};
-
/* Ouch - five different hooks? Maybe this should be a config option..... -- BC */
static struct
{
diff -Nru a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
--- a/net/ipv4/netfilter/iptable_raw.c 2005-01-11 13:39:58 +01:00
+++ b/net/ipv4/netfilter/iptable_raw.c 2005-01-11 13:39:58 +01:00
@@ -8,25 +8,6 @@
#define RAW_VALID_HOOKS ((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_OUT))
-/* 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;
-};
-
static struct
{
struct ipt_replace repl;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-01-11 12:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-01-11 12:49 [PATCH 2.6 5/6]: move ipt_error and ipt_standard to iptables.h Patrick McHardy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.