Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-12 16:11:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NETFILTER]: futher {ip,ip6,arp}_tables unification

Browse Source 
This patch moves {ip,ip6,arp}t_entry_{match,target} definitions to
x_tables.h. This move simplifies code and future compatibility fixes.

Signed-off-by: Dmitry Mishin <dim@openvz.org>
Acked-off-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dmitry Mishin 2006-03-22 13:56:56 -08:00 committed by David S. Miller
parent 81fbfd6925
commit 1e30a014e3
5 changed files with 66 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
include/linux/netfilter/x_tables.h
View File

@ -4,6 +4,62 @@
#define XT_FUNCTION_MAXNAMELEN 30 #define XT_FUNCTION_MAXNAMELEN 30
#define XT_TABLE_MAXNAMELEN 32 #define XT_TABLE_MAXNAMELEN 32
struct xt_entry_match
{
union {
struct {
u_int16_t match_size;
/* Used by userspace */
char name[XT_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t match_size;
/* Used inside the kernel */
struct xt_match *match;
} kernel;
/* Total length */
u_int16_t match_size;
} u;
unsigned char data[0];
};
struct xt_entry_target
{
union {
struct {
u_int16_t target_size;
/* Used by userspace */
char name[XT_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t target_size;
/* Used inside the kernel */
struct xt_target *target;
} kernel;
/* Total length */
u_int16_t target_size;
} u;
unsigned char data[0];
};
struct xt_standard_target
{
struct xt_entry_target target;
int verdict;
};
/* The argument to IPT_SO_GET_REVISION_*. Returns highest revision /* The argument to IPT_SO_GET_REVISION_*. Returns highest revision
* kernel supports, if >= revision. */ * kernel supports, if >= revision. */
struct xt_get_revision struct xt_get_revision

31
include/linux/netfilter_arp/arp_tables.h
View File

@ -65,35 +65,8 @@ struct arpt_arp {
u_int16_t invflags; u_int16_t invflags;
}; };
struct arpt_entry_target #define arpt_entry_target xt_entry_target
{ #define arpt_standard_target xt_standard_target
union {
struct {
u_int16_t target_size;
/* Used by userspace */
char name[ARPT_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t target_size;
/* Used inside the kernel */
struct arpt_target *target;
} kernel;
/* Total length */
u_int16_t target_size;
} u;
unsigned char data[0];
};
struct arpt_standard_target
{
struct arpt_entry_target target;
int verdict;
};
/* Values for "flag" field in struct arpt_ip (general arp structure). /* Values for "flag" field in struct arpt_ip (general arp structure).
* No flags defined yet. * No flags defined yet.

58
include/linux/netfilter_ipv4/ip_tables.h
View File

@ -52,61 +52,9 @@ struct ipt_ip {
u_int8_t invflags; u_int8_t invflags;
}; };
struct ipt_entry_match #define ipt_entry_match xt_entry_match
{ #define ipt_entry_target xt_entry_target
union { #define ipt_standard_target xt_standard_target
struct {
u_int16_t match_size;
/* Used by userspace */
char name[IPT_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t match_size;
/* Used inside the kernel */
struct ipt_match *match;
} kernel;
/* Total length */
u_int16_t match_size;
} u;
unsigned char data[0];
};
struct ipt_entry_target
{
union {
struct {
u_int16_t target_size;
/* Used by userspace */
char name[IPT_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t target_size;
/* Used inside the kernel */
struct ipt_target *target;
} kernel;
/* Total length */
u_int16_t target_size;
} u;
unsigned char data[0];
};
struct ipt_standard_target
{
struct ipt_entry_target target;
int verdict;
};
#define ipt_counters xt_counters #define ipt_counters xt_counters

57
include/linux/netfilter_ipv6/ip6_tables.h
View File

@ -56,60 +56,9 @@ struct ip6t_ip6 {
u_int8_t invflags; u_int8_t invflags;
}; };
/* FIXME: If alignment in kernel different from userspace? --RR */ #define ip6t_entry_match xt_entry_match
struct ip6t_entry_match #define ip6t_entry_target xt_entry_target
{ #define ip6t_standard_target xt_standard_target
union {
struct {
u_int16_t match_size;
/* Used by userspace */
char name[IP6T_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t match_size;
/* Used inside the kernel */
struct ip6t_match *match;
} kernel;
/* Total length */
u_int16_t match_size;
} u;
unsigned char data[0];
};
struct ip6t_entry_target
{
union {
struct {
u_int16_t target_size;
/* Used by userspace */
char name[IP6T_FUNCTION_MAXNAMELEN-1];
u_int8_t revision;
} user;
struct {
u_int16_t target_size;
/* Used inside the kernel */
struct ip6t_target *target;
} kernel;
/* Total length */
u_int16_t target_size;
} u;
unsigned char data[0];
};
struct ip6t_standard_target
{
struct ip6t_entry_target target;
int verdict;
};
#define ip6t_counters xt_counters #define ip6t_counters xt_counters

4
include/net/tc_act/tc_ipt.h
View File

@ -3,14 +3,14 @@
#include <net/act_api.h> #include <net/act_api.h>
struct ipt_entry_target; struct xt_entry_target;
struct tcf_ipt struct tcf_ipt
{ {
tca_gen(ipt); tca_gen(ipt);
u32 hook; u32 hook;
char *tname; char *tname;
struct ipt_entry_target *t; struct xt_entry_target *t;
}; };
#endif #endif