Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NETFILTER]: {ip,ip6}_tables: use struct xt_table instead of redefined structure names

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Engelhardt 2007-02-07 15:12:33 -08:00 committed by David S. Miller
parent 6709dbbb19
commit e60a13e030
11 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,12 +272,9 @@ ipt_get_target(struct ipt_entry *e)
#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(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);
#define IPT_ALIGN(s) XT_ALIGN(s)

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

@ -286,14 +286,14 @@ ip6t_get_target(struct ip6t_entry *e)
#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);

2
net/ipv4/netfilter/ip_nat_rule.c
View File

@ -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,

20
net/ipv4/netfilter/ip_tables.c
View File

@ -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 *t,
}
}
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 * alloc_counters(struct ipt_table *table)
static 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 @@ static int compat_table_info(struct xt_table_info *info,
static 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 __user *uptr, int *len)
{
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 int valid_hooks,
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, unsigned int len, int compat)
char *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_entries __user *uptr, int *len)
{
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 *table, const struct ipt_replace *repl)
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;

2
net/ipv4/netfilter/iptable_filter.c
View File

@ -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,

2
net/ipv4/netfilter/iptable_mangle.c
View File

@ -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,

2
net/ipv4/netfilter/iptable_raw.c
View File

@ -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,

2
net/ipv4/netfilter/nf_nat_rule.c
View File

@ -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,

2
net/ipv6/netfilter/ip6table_filter.c
View File

@ -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,

2
net/ipv6/netfilter/ip6table_mangle.c
View File

@ -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,

2
net/sched/act_ipt.c
View File

@ -52,7 +52,7 @@ static struct tcf_hashinfo ipt_hash_info = {
static 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,