Skip to content

Commit

Permalink
[NETFILTER]: x_tables: add xt_{match,target} arguments to match/targe…
Browse files Browse the repository at this point in the history 
…t functions

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Mar 21, 2006
1 parent 1c52483 commit c498673
Show file tree
Hide file tree
Showing 69 changed files with 160 additions and 29 deletions.
1 change: 1 addition & 0 deletions net/ipv4/netfilter/arp_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ static unsigned int arpt_error(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down
11 changes: 6 additions & 5 deletions net/ipv4/netfilter/arpt_mangle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("arptables arp payload mangle target");

static unsigned int
target(struct sk_buff **pskb, const struct net_device *in,
const struct net_device *out, unsigned int hooknum, const void *targinfo,
void *userinfo)
target(struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out,
unsigned int hooknum, const struct xt_target *target,
const void *targinfo, void *userinfo)
{
const struct arpt_mangle *mangle = targinfo;
struct arphdr *arp;
Expand Down Expand Up @@ -65,8 +66,8 @@ target(struct sk_buff **pskb, const struct net_device *in,
}

static int
checkentry(const char *tablename, const void *e, void *targinfo,
unsigned int targinfosize, unsigned int hook_mask)
checkentry(const char *tablename, const void *e, const struct xt_target *target,
void *targinfo, unsigned int targinfosize, unsigned int hook_mask)
{
const struct arpt_mangle *mangle = targinfo;

Expand Down
4 changes: 4 additions & 0 deletions net/ipv4/netfilter/ip_nat_rule.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ static unsigned int ipt_snat_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct ipt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -145,6 +146,7 @@ static unsigned int ipt_dnat_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct ipt_target *target,
const void *targinfo,
void *userinfo)
{
Expand All @@ -170,6 +172,7 @@ static unsigned int ipt_dnat_target(struct sk_buff **pskb,

static int ipt_snat_checkentry(const char *tablename,
const void *entry,
const struct ipt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand All @@ -186,6 +189,7 @@ static int ipt_snat_checkentry(const char *tablename,

static int ipt_dnat_checkentry(const char *tablename,
const void *entry,
const struct ipt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
3 changes: 3 additions & 0 deletions net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ ipt_error(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -1285,6 +1286,7 @@ static int
icmp_match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
int offset,
unsigned int protoff,
Expand Down Expand Up @@ -1318,6 +1320,7 @@ icmp_match(const struct sk_buff *skb,
static int
icmp_checkentry(const char *tablename,
const void *info,
const struct xt_match *match,
void *matchinfo,
unsigned int matchsize,
unsigned int hook_mask)
Expand Down
7 changes: 5 additions & 2 deletions net/ipv4/netfilter/ipt_CLUSTERIP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -380,6 +381,7 @@ target(struct sk_buff **pskb,
static int
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down Expand Up @@ -458,9 +460,10 @@ checkentry(const char *tablename,
}

/* drop reference count of cluster config when rule is deleted */
static void destroy(void *matchinfo, unsigned int matchinfosize)
static void destroy(const struct xt_target *target, void *targinfo,
unsigned int targinfosize)
{
struct ipt_clusterip_tgt_info *cipinfo = matchinfo;
struct ipt_clusterip_tgt_info *cipinfo = targinfo;

/* if no more entries are referencing the config, remove it
* from the list and destroy the proc entry */
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_DSCP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -58,6 +59,7 @@ target(struct sk_buff **pskb,
static int
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_ECN.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand All @@ -114,6 +115,7 @@ target(struct sk_buff **pskb,
static int
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_LOG.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ ipt_log_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand All @@ -437,6 +438,7 @@ ipt_log_target(struct sk_buff **pskb,

static int ipt_log_checkentry(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_MASQUERADE.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ static DEFINE_RWLOCK(masq_lock);
static int
masquerade_check(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand All @@ -63,6 +64,7 @@ masquerade_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_NETMAP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ MODULE_DESCRIPTION("iptables 1:1 NAT mapping of IP networks target");
static int
check(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand All @@ -54,6 +55,7 @@ target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_REDIRECT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ MODULE_DESCRIPTION("iptables REDIRECT target module");
static int
redirect_check(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand All @@ -56,6 +57,7 @@ redirect_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_REJECT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ static unsigned int reject(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -283,6 +284,7 @@ static unsigned int reject(struct sk_buff **pskb,

static int check(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
4 changes: 3 additions & 1 deletion net/ipv4/netfilter/ipt_SAME.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ MODULE_DESCRIPTION("iptables special SNAT module for consistent sourceip");
static int
same_check(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down Expand Up @@ -115,7 +116,7 @@ same_check(const char *tablename,
}

static void
same_destroy(void *targinfo,
same_destroy(const struct xt_target *target, void *targinfo,
unsigned int targinfosize)
{
struct ipt_same_info *mr = targinfo;
Expand All @@ -131,6 +132,7 @@ same_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_TCPMSS.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ ipt_tcpmss_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -211,6 +212,7 @@ static inline int find_syn_match(const struct ipt_entry_match *m)
static int
ipt_tcpmss_checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_TOS.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo,
void *userinfo)
{
Expand Down Expand Up @@ -53,6 +54,7 @@ target(struct sk_buff **pskb,
static int
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
8 changes: 5 additions & 3 deletions net/ipv4/netfilter/ipt_TTL.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ MODULE_DESCRIPTION("IP tables TTL modification module");
MODULE_LICENSE("GPL");

static unsigned int
ipt_ttl_target(struct sk_buff **pskb, const struct net_device *in,
const struct net_device *out, unsigned int hooknum,
const void *targinfo, void *userinfo)
ipt_ttl_target(struct sk_buff **pskb,
const struct net_device *in, const struct net_device *out,
unsigned int hooknum, const struct xt_target *target,
const void *targinfo, void *userinfo)
{
struct iphdr *iph;
const struct ipt_TTL_info *info = targinfo;
Expand Down Expand Up @@ -67,6 +68,7 @@ ipt_ttl_target(struct sk_buff **pskb, const struct net_device *in,

static int ipt_ttl_checkentry(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hook_mask)
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_ULOG.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ static unsigned int ipt_ulog_target(struct sk_buff **pskb,
const struct net_device *in,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const void *targinfo, void *userinfo)
{
struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) targinfo;
Expand Down Expand Up @@ -339,6 +340,7 @@ static void ipt_logfn(unsigned int pf,

static int ipt_ulog_checkentry(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int targinfosize,
unsigned int hookmask)
Expand Down
5 changes: 3 additions & 2 deletions net/ipv4/netfilter/ipt_addrtype.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ static inline int match_type(u_int32_t addr, u_int16_t mask)
return !!(mask & (1 << inet_addr_type(addr)));
}

static int match(const struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, const void *matchinfo,
static int match(const struct sk_buff *skb,
const struct net_device *in, const struct net_device *out,
const struct xt_match *match, const void *matchinfo,
int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_addrtype_info *info = matchinfo;
Expand Down
2 changes: 2 additions & 0 deletions net/ipv4/netfilter/ipt_ah.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
int offset,
unsigned int protoff,
Expand Down Expand Up @@ -71,6 +72,7 @@ match(const struct sk_buff *skb,
static int
checkentry(const char *tablename,
const void *ip_void,
const struct xt_match *match,
void *matchinfo,
unsigned int matchinfosize,
unsigned int hook_mask)
Expand Down
5 changes: 3 additions & 2 deletions net/ipv4/netfilter/ipt_dscp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("iptables DSCP matching module");
MODULE_LICENSE("GPL");

static int match(const struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, const void *matchinfo,
static int match(const struct sk_buff *skb,
const struct net_device *in, const struct net_device *out,
const struct xt_match *match, const void *matchinfo,
int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_dscp_info *info = matchinfo;
Expand Down
6 changes: 4 additions & 2 deletions net/ipv4/netfilter/ipt_ecn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ static inline int match_tcp(const struct sk_buff *skb,
return 1;
}

static int match(const struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, const void *matchinfo,
static int match(const struct sk_buff *skb,
const struct net_device *in, const struct net_device *out,
const struct xt_match *match, const void *matchinfo,
int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_ecn_info *info = matchinfo;
Expand All @@ -86,6 +87,7 @@ static int match(const struct sk_buff *skb, const struct net_device *in,
}

static int checkentry(const char *tablename, const void *ip_void,
const struct xt_match *match,
void *matchinfo, unsigned int matchsize,
unsigned int hook_mask)
{
Expand Down
Loading

0 comments on commit c498673

Please sign in to comment.