dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

netfilter: xtables: substitute temporary defines by final name 

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt 2009-07-05 19:43:26 +02:00
parent de74c16996
commit 4b560b447d
97 changed files with 133 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,8 +182,6 @@ struct xt_counters_info {
#include <linux/netdevice.h> #include <linux/netdevice.h>
#define xt_match_param xt_action_param
#define xt_target_param xt_action_param
/** /**
* struct xt_action_param - parameters for matches/targets * struct xt_action_param - parameters for matches/targets
* *

2
net/bridge/netfilter/ebt_802_3.c
View File

@ -13,7 +13,7 @@
#include <linux/netfilter_bridge/ebt_802_3.h> #include <linux/netfilter_bridge/ebt_802_3.h>
static bool static bool
ebt_802_3_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_802_3_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_802_3_info *info = par->matchinfo; const struct ebt_802_3_info *info = par->matchinfo;
const struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb); const struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);

2
net/bridge/netfilter/ebt_among.c
View File

@ -129,7 +129,7 @@ static int get_ip_src(const struct sk_buff *skb, __be32 *addr)
} }
static bool static bool
ebt_among_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_among_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_among_info *info = par->matchinfo; const struct ebt_among_info *info = par->matchinfo;
const char *dmac, *smac; const char *dmac, *smac;

2
net/bridge/netfilter/ebt_arp.c
View File

@ -16,7 +16,7 @@
#include <linux/netfilter_bridge/ebt_arp.h> #include <linux/netfilter_bridge/ebt_arp.h>
static bool static bool
ebt_arp_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_arp_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_arp_info *info = par->matchinfo; const struct ebt_arp_info *info = par->matchinfo;
const struct arphdr *ah; const struct arphdr *ah;

2
net/bridge/netfilter/ebt_arpreply.c
View File

@ -16,7 +16,7 @@
#include <linux/netfilter_bridge/ebt_arpreply.h> #include <linux/netfilter_bridge/ebt_arpreply.h>
static unsigned int static unsigned int
ebt_arpreply_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_arpreply_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_arpreply_info *info = par->targinfo; const struct ebt_arpreply_info *info = par->targinfo;
const __be32 *siptr, *diptr; const __be32 *siptr, *diptr;

2
net/bridge/netfilter/ebt_dnat.c
View File

@ -15,7 +15,7 @@
#include <linux/netfilter_bridge/ebt_nat.h> #include <linux/netfilter_bridge/ebt_nat.h>
static unsigned int static unsigned int
ebt_dnat_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_nat_info *info = par->targinfo; const struct ebt_nat_info *info = par->targinfo;

2
net/bridge/netfilter/ebt_ip.c
View File

@ -25,7 +25,7 @@ struct tcpudphdr {
}; };
static bool static bool
ebt_ip_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_ip_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_ip_info *info = par->matchinfo; const struct ebt_ip_info *info = par->matchinfo;
const struct iphdr *ih; const struct iphdr *ih;

2
net/bridge/netfilter/ebt_ip6.c
View File

@ -28,7 +28,7 @@ struct tcpudphdr {
}; };
static bool static bool
ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_ip6_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_ip6_info *info = par->matchinfo; const struct ebt_ip6_info *info = par->matchinfo;
const struct ipv6hdr *ih6; const struct ipv6hdr *ih6;

2
net/bridge/netfilter/ebt_limit.c
View File

@ -32,7 +32,7 @@ static DEFINE_SPINLOCK(limit_lock);
#define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ) #define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ)
static bool static bool
ebt_limit_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_limit_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ebt_limit_info *info = (void *)par->matchinfo; struct ebt_limit_info *info = (void *)par->matchinfo;
unsigned long now = jiffies; unsigned long now = jiffies;

2
net/bridge/netfilter/ebt_log.c
View File

@ -171,7 +171,7 @@ out:
} }
static unsigned int static unsigned int
ebt_log_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_log_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_log_info *info = par->targinfo; const struct ebt_log_info *info = par->targinfo;
struct nf_loginfo li; struct nf_loginfo li;

2
net/bridge/netfilter/ebt_mark.c
View File

@ -19,7 +19,7 @@
#include <linux/netfilter_bridge/ebt_mark_t.h> #include <linux/netfilter_bridge/ebt_mark_t.h>
static unsigned int static unsigned int
ebt_mark_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_mark_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_mark_t_info *info = par->targinfo; const struct ebt_mark_t_info *info = par->targinfo;
int action = info->target & -16; int action = info->target & -16;

2
net/bridge/netfilter/ebt_mark_m.c
View File

@ -13,7 +13,7 @@
#include <linux/netfilter_bridge/ebt_mark_m.h> #include <linux/netfilter_bridge/ebt_mark_m.h>
static bool static bool
ebt_mark_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_mark_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_mark_m_info *info = par->matchinfo; const struct ebt_mark_m_info *info = par->matchinfo;

2
net/bridge/netfilter/ebt_nflog.c
View File

@ -20,7 +20,7 @@
#include <net/netfilter/nf_log.h> #include <net/netfilter/nf_log.h>
static unsigned int static unsigned int
ebt_nflog_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_nflog_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_nflog_info *info = par->targinfo; const struct ebt_nflog_info *info = par->targinfo;
struct nf_loginfo li; struct nf_loginfo li;

2
net/bridge/netfilter/ebt_pkttype.c
View File

@ -13,7 +13,7 @@
#include <linux/netfilter_bridge/ebt_pkttype.h> #include <linux/netfilter_bridge/ebt_pkttype.h>
static bool static bool
ebt_pkttype_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_pkttype_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_pkttype_info *info = par->matchinfo; const struct ebt_pkttype_info *info = par->matchinfo;

2
net/bridge/netfilter/ebt_redirect.c
View File

@ -16,7 +16,7 @@
#include <linux/netfilter_bridge/ebt_redirect.h> #include <linux/netfilter_bridge/ebt_redirect.h>
static unsigned int static unsigned int
ebt_redirect_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_redirect_info *info = par->targinfo; const struct ebt_redirect_info *info = par->targinfo;

2
net/bridge/netfilter/ebt_snat.c
View File

@ -17,7 +17,7 @@
#include <linux/netfilter_bridge/ebt_nat.h> #include <linux/netfilter_bridge/ebt_nat.h>
static unsigned int static unsigned int
ebt_snat_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_nat_info *info = par->targinfo; const struct ebt_nat_info *info = par->targinfo;

2
net/bridge/netfilter/ebt_stp.c
View File

@ -120,7 +120,7 @@ static bool ebt_filter_config(const struct ebt_stp_info *info,
} }
static bool static bool
ebt_stp_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_stp_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_stp_info *info = par->matchinfo; const struct ebt_stp_info *info = par->matchinfo;
const struct stp_header *sp; const struct stp_header *sp;

2
net/bridge/netfilter/ebt_ulog.c
View File

@ -243,7 +243,7 @@ static void ebt_log_packet(u_int8_t pf, unsigned int hooknum,
} }
static unsigned int static unsigned int
ebt_ulog_tg(struct sk_buff *skb, const struct xt_target_param *par) ebt_ulog_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
ebt_ulog_packet(par->hooknum, skb, par->in, par->out, ebt_ulog_packet(par->hooknum, skb, par->in, par->out,
par->targinfo, NULL); par->targinfo, NULL);

2
net/bridge/netfilter/ebt_vlan.c
View File

@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
#define EXIT_ON_MISMATCH(_MATCH_,_MASK_) {if (!((info->_MATCH_ == _MATCH_)^!!(info->invflags & _MASK_))) return false; } #define EXIT_ON_MISMATCH(_MATCH_,_MASK_) {if (!((info->_MATCH_ == _MATCH_)^!!(info->invflags & _MASK_))) return false; }
static bool static bool
ebt_vlan_mt(const struct sk_buff *skb, const struct xt_match_param *par) ebt_vlan_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ebt_vlan_info *info = par->matchinfo; const struct ebt_vlan_info *info = par->matchinfo;
const struct vlan_hdr *fp; const struct vlan_hdr *fp;

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

@ -224,7 +224,7 @@ static inline int arp_checkentry(const struct arpt_arp *arp)
} }
static unsigned int static unsigned int
arpt_error(struct sk_buff *skb, const struct xt_target_param *par) arpt_error(struct sk_buff *skb, const struct xt_action_param *par)
{ {
if (net_ratelimit()) if (net_ratelimit())
printk("arp_tables: error: '%s'\n", printk("arp_tables: error: '%s'\n",

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

@ -9,7 +9,7 @@ MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("arptables arp payload mangle target"); MODULE_DESCRIPTION("arptables arp payload mangle target");
static unsigned int static unsigned int
target(struct sk_buff *skb, const struct xt_target_param *par) target(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct arpt_mangle *mangle = par->targinfo; const struct arpt_mangle *mangle = par->targinfo;
const struct arphdr *arp; const struct arphdr *arp;

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

@ -165,7 +165,7 @@ ip_checkentry(const struct ipt_ip *ip)
} }
static unsigned int static unsigned int
ipt_error(struct sk_buff *skb, const struct xt_target_param *par) ipt_error(struct sk_buff *skb, const struct xt_action_param *par)
{ {
if (net_ratelimit()) if (net_ratelimit())
pr_info("error: `%s'\n", (const char *)par->targinfo); pr_info("error: `%s'\n", (const char *)par->targinfo);
@ -2138,7 +2138,7 @@ icmp_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,
} }
static bool static bool
icmp_match(const struct sk_buff *skb, const struct xt_match_param *par) icmp_match(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct icmphdr *ic; const struct icmphdr *ic;
struct icmphdr _icmph; struct icmphdr _icmph;

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

@ -282,7 +282,7 @@ clusterip_responsible(const struct clusterip_config *config, u_int32_t hash)
***********************************************************************/ ***********************************************************************/
static unsigned int static unsigned int
clusterip_tg(struct sk_buff *skb, const struct xt_target_param *par) clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ipt_clusterip_tgt_info *cipinfo = par->targinfo; const struct ipt_clusterip_tgt_info *cipinfo = par->targinfo;
struct nf_conn *ct; struct nf_conn *ct;

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

@ -77,7 +77,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo)
} }
static unsigned int static unsigned int
ecn_tg(struct sk_buff *skb, const struct xt_target_param *par) ecn_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ipt_ECN_info *einfo = par->targinfo; const struct ipt_ECN_info *einfo = par->targinfo;

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

@ -425,7 +425,7 @@ ipt_log_packet(u_int8_t pf,
} }
static unsigned int static unsigned int
log_tg(struct sk_buff *skb, const struct xt_target_param *par) log_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ipt_log_info *loginfo = par->targinfo; const struct ipt_log_info *loginfo = par->targinfo;
struct nf_loginfo li; struct nf_loginfo li;

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

@ -44,7 +44,7 @@ static int masquerade_tg_check(const struct xt_tgchk_param *par)
} }
static unsigned int static unsigned int
masquerade_tg(struct sk_buff *skb, const struct xt_target_param *par) masquerade_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct nf_conn *ct; struct nf_conn *ct;
struct nf_conn_nat *nat; struct nf_conn_nat *nat;

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

@ -38,7 +38,7 @@ static int netmap_tg_check(const struct xt_tgchk_param *par)
} }
static unsigned int static unsigned int
netmap_tg(struct sk_buff *skb, const struct xt_target_param *par) netmap_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct nf_conn *ct; struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;

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

@ -42,7 +42,7 @@ static int redirect_tg_check(const struct xt_tgchk_param *par)
} }
static unsigned int static unsigned int
redirect_tg(struct sk_buff *skb, const struct xt_target_param *par) redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct nf_conn *ct; struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;

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

@ -136,7 +136,7 @@ static inline void send_unreach(struct sk_buff *skb_in, int code)
} }
static unsigned int static unsigned int
reject_tg(struct sk_buff *skb, const struct xt_target_param *par) reject_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ipt_reject_info *reject = par->targinfo; const struct ipt_reject_info *reject = par->targinfo;

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

@ -276,7 +276,7 @@ alloc_failure:
} }
static unsigned int static unsigned int
ulog_tg(struct sk_buff *skb, const struct xt_target_param *par) ulog_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
ipt_ulog_packet(par->hooknum, skb, par->in, par->out, ipt_ulog_packet(par->hooknum, skb, par->in, par->out,
par->targinfo, NULL); par->targinfo, NULL);

4
net/ipv4/netfilter/ipt_addrtype.c
View File

@ -30,7 +30,7 @@ static inline bool match_type(struct net *net, const struct net_device *dev,
} }
static bool static bool
addrtype_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par) addrtype_mt_v0(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct net *net = dev_net(par->in ? par->in : par->out); struct net *net = dev_net(par->in ? par->in : par->out);
const struct ipt_addrtype_info *info = par->matchinfo; const struct ipt_addrtype_info *info = par->matchinfo;
@ -48,7 +48,7 @@ addrtype_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
} }
static bool static bool
addrtype_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par) addrtype_mt_v1(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct net *net = dev_net(par->in ? par->in : par->out); struct net *net = dev_net(par->in ? par->in : par->out);
const struct ipt_addrtype_info_v1 *info = par->matchinfo; const struct ipt_addrtype_info_v1 *info = par->matchinfo;

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

@ -30,7 +30,7 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
return r; return r;
} }
static bool ah_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool ah_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ip_auth_hdr _ahdr; struct ip_auth_hdr _ahdr;
const struct ip_auth_hdr *ah; const struct ip_auth_hdr *ah;

3
net/ipv4/netfilter/ipt_ecn.c
View File

@ -67,7 +67,8 @@ static inline bool match_tcp(const struct sk_buff *skb,
return true; return true;
} }
static bool ecn_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool ecn_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct ipt_ecn_info *info = par->matchinfo; const struct ipt_ecn_info *info = par->matchinfo;

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

@ -39,7 +39,7 @@ static const struct xt_table nat_table = {
/* Source NAT */ /* Source NAT */
static unsigned int static unsigned int
ipt_snat_target(struct sk_buff *skb, const struct xt_target_param *par) ipt_snat_target(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct nf_conn *ct; struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
@ -58,7 +58,7 @@ ipt_snat_target(struct sk_buff *skb, const struct xt_target_param *par)
} }
static unsigned int static unsigned int
ipt_dnat_target(struct sk_buff *skb, const struct xt_target_param *par) ipt_dnat_target(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct nf_conn *ct; struct nf_conn *ct;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;

4
net/ipv6/netfilter/ip6_tables.c
View File

@ -197,7 +197,7 @@ ip6_checkentry(const struct ip6t_ip6 *ipv6)
} }
static unsigned int static unsigned int
ip6t_error(struct sk_buff *skb, const struct xt_target_param *par) ip6t_error(struct sk_buff *skb, const struct xt_action_param *par)
{ {
if (net_ratelimit()) if (net_ratelimit())
pr_info("error: `%s'\n", (const char *)par->targinfo); pr_info("error: `%s'\n", (const char *)par->targinfo);
@ -2154,7 +2154,7 @@ icmp6_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,
} }
static bool static bool
icmp6_match(const struct sk_buff *skb, const struct xt_match_param *par) icmp6_match(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct icmp6hdr *ic; const struct icmp6hdr *ic;
struct icmp6hdr _icmph; struct icmp6hdr _icmph;

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

@ -436,7 +436,7 @@ ip6t_log_packet(u_int8_t pf,
} }
static unsigned int static unsigned int
log_tg6(struct sk_buff *skb, const struct xt_target_param *par) log_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ip6t_log_info *loginfo = par->targinfo; const struct ip6t_log_info *loginfo = par->targinfo;
struct nf_loginfo li; struct nf_loginfo li;

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

@ -175,7 +175,7 @@ send_unreach(struct net *net, struct sk_buff *skb_in, unsigned char code,
} }
static unsigned int static unsigned int
reject_tg6(struct sk_buff *skb, const struct xt_target_param *par) reject_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ip6t_reject_info *reject = par->targinfo; const struct ip6t_reject_info *reject = par->targinfo;
struct net *net = dev_net((par->in != NULL) ? par->in : par->out); struct net *net = dev_net((par->in != NULL) ? par->in : par->out);

3
net/ipv6/netfilter/ip6t_ah.c
View File

@ -36,7 +36,8 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
return r; return r;
} }
static bool ah_mt6(const struct sk_buff *skb, const struct xt_match_param *par) static bool ah_mt6(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
struct ip_auth_hdr _ah; struct ip_auth_hdr _ah;
const struct ip_auth_hdr *ah; const struct ip_auth_hdr *ah;

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

@ -20,7 +20,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>"); MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
static bool static bool
eui64_mt6(const struct sk_buff *skb, const struct xt_match_param *par) eui64_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
unsigned char eui64[8]; unsigned char eui64[8];

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

@ -35,7 +35,7 @@ id_match(u_int32_t min, u_int32_t max, u_int32_t id, bool invert)
} }
static bool static bool
frag_mt6(const struct sk_buff *skb, const struct xt_match_param *par) frag_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct frag_hdr _frag; struct frag_hdr _frag;
const struct frag_hdr *fh; const struct frag_hdr *fh;

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

@ -44,7 +44,7 @@ MODULE_ALIAS("ip6t_dst");
static struct xt_match hbh_mt6_reg[] __read_mostly; static struct xt_match hbh_mt6_reg[] __read_mostly;
static bool static bool
hbh_mt6(const struct sk_buff *skb, const struct xt_match_param *par) hbh_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ipv6_opt_hdr _optsh; struct ipv6_opt_hdr _optsh;
const struct ipv6_opt_hdr *oh; const struct ipv6_opt_hdr *oh;

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

@ -27,7 +27,7 @@ MODULE_DESCRIPTION("Xtables: IPv6 header types match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>"); MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
static bool static bool
ipv6header_mt6(const struct sk_buff *skb, const struct xt_match_param *par) ipv6header_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct ip6t_ipv6header_info *info = par->matchinfo; const struct ip6t_ipv6header_info *info = par->matchinfo;
unsigned int temp; unsigned int temp;

3
net/ipv6/netfilter/ip6t_mh.c
View File

@ -32,7 +32,8 @@ type_match(u_int8_t min, u_int8_t max, u_int8_t type, bool invert)
return (type >= min && type <= max) ^ invert; return (type >= min && type <= max) ^ invert;
} }
static bool mh_mt6(const struct sk_buff *skb, const struct xt_match_param *par) static bool mh_mt6(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
struct ip6_mh _mh; struct ip6_mh _mh;
const struct ip6_mh *mh; const struct ip6_mh *mh;

3
net/ipv6/netfilter/ip6t_rt.c
View File

@ -36,7 +36,8 @@ segsleft_match(u_int32_t min, u_int32_t max, u_int32_t id, bool invert)
return r; return r;
} }
static bool rt_mt6(const struct sk_buff *skb, const struct xt_match_param *par) static bool rt_mt6(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
struct ipv6_rt_hdr _route; struct ipv6_rt_hdr _route;
const struct ipv6_rt_hdr *rh; const struct ipv6_rt_hdr *rh;

2
net/netfilter/xt_CLASSIFY.c
View File

@ -27,7 +27,7 @@ MODULE_ALIAS("ipt_CLASSIFY");
MODULE_ALIAS("ip6t_CLASSIFY"); MODULE_ALIAS("ip6t_CLASSIFY");
static unsigned int static unsigned int
classify_tg(struct sk_buff *skb, const struct xt_target_param *par) classify_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_classify_target_info *clinfo = par->targinfo; const struct xt_classify_target_info *clinfo = par->targinfo;

2
net/netfilter/xt_CONNSECMARK.c
View File

@ -64,7 +64,7 @@ static void secmark_restore(struct sk_buff *skb)
} }
static unsigned int static unsigned int
connsecmark_tg(struct sk_buff *skb, const struct xt_target_param *par) connsecmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_connsecmark_target_info *info = par->targinfo; const struct xt_connsecmark_target_info *info = par->targinfo;

2
net/netfilter/xt_CT.c
View File

@ -20,7 +20,7 @@
#include <net/netfilter/nf_conntrack_zones.h> #include <net/netfilter/nf_conntrack_zones.h>
static unsigned int xt_ct_target(struct sk_buff *skb, static unsigned int xt_ct_target(struct sk_buff *skb,
const struct xt_target_param *par) const struct xt_action_param *par)
{ {
const struct xt_ct_target_info *info = par->targinfo; const struct xt_ct_target_info *info = par->targinfo;
struct nf_conn *ct = info->ct; struct nf_conn *ct = info->ct;

8
net/netfilter/xt_DSCP.c
View File

@ -28,7 +28,7 @@ MODULE_ALIAS("ipt_TOS");
MODULE_ALIAS("ip6t_TOS"); MODULE_ALIAS("ip6t_TOS");
static unsigned int static unsigned int
dscp_tg(struct sk_buff *skb, const struct xt_target_param *par) dscp_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_DSCP_info *dinfo = par->targinfo; const struct xt_DSCP_info *dinfo = par->targinfo;
u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT; u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;
@ -45,7 +45,7 @@ dscp_tg(struct sk_buff *skb, const struct xt_target_param *par)
} }
static unsigned int static unsigned int
dscp_tg6(struct sk_buff *skb, const struct xt_target_param *par) dscp_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_DSCP_info *dinfo = par->targinfo; const struct xt_DSCP_info *dinfo = par->targinfo;
u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT; u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;
@ -72,7 +72,7 @@ static int dscp_tg_check(const struct xt_tgchk_param *par)
} }
static unsigned int static unsigned int
tos_tg(struct sk_buff *skb, const struct xt_target_param *par) tos_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tos_target_info *info = par->targinfo; const struct xt_tos_target_info *info = par->targinfo;
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
@ -92,7 +92,7 @@ tos_tg(struct sk_buff *skb, const struct xt_target_param *par)
} }
static unsigned int static unsigned int
tos_tg6(struct sk_buff *skb, const struct xt_target_param *par) tos_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tos_target_info *info = par->targinfo; const struct xt_tos_target_info *info = par->targinfo;
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);

4
net/netfilter/xt_HL.c
View File

@ -26,7 +26,7 @@ MODULE_DESCRIPTION("Xtables: Hoplimit/TTL Limit field modification target");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static unsigned int static unsigned int
ttl_tg(struct sk_buff *skb, const struct xt_target_param *par) ttl_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct iphdr *iph; struct iphdr *iph;
const struct ipt_TTL_info *info = par->targinfo; const struct ipt_TTL_info *info = par->targinfo;
@ -66,7 +66,7 @@ ttl_tg(struct sk_buff *skb, const struct xt_target_param *par)
} }
static unsigned int static unsigned int
hl_tg6(struct sk_buff *skb, const struct xt_target_param *par) hl_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ipv6hdr *ip6h; struct ipv6hdr *ip6h;
const struct ip6t_HL_info *info = par->targinfo; const struct ip6t_HL_info *info = par->targinfo;

2
net/netfilter/xt_LED.c
View File

@ -49,7 +49,7 @@ struct xt_led_info_internal {
}; };
static unsigned int static unsigned int
led_tg(struct sk_buff *skb, const struct xt_target_param *par) led_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_led_info *ledinfo = par->targinfo; const struct xt_led_info *ledinfo = par->targinfo;
struct xt_led_info_internal *ledinternal = ledinfo->internal_data; struct xt_led_info_internal *ledinternal = ledinfo->internal_data;

2
net/netfilter/xt_NFLOG.c
View File

@ -22,7 +22,7 @@ MODULE_ALIAS("ipt_NFLOG");
MODULE_ALIAS("ip6t_NFLOG"); MODULE_ALIAS("ip6t_NFLOG");
static unsigned int static unsigned int
nflog_tg(struct sk_buff *skb, const struct xt_target_param *par) nflog_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_nflog_info *info = par->targinfo; const struct xt_nflog_info *info = par->targinfo;
struct nf_loginfo li; struct nf_loginfo li;

4
net/netfilter/xt_NFQUEUE.c
View File

@ -31,7 +31,7 @@ static u32 jhash_initval __read_mostly;
static bool rnd_inited __read_mostly; static bool rnd_inited __read_mostly;
static unsigned int static unsigned int
nfqueue_tg(struct sk_buff *skb, const struct xt_target_param *par) nfqueue_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_NFQ_info *tinfo = par->targinfo; const struct xt_NFQ_info *tinfo = par->targinfo;
@ -65,7 +65,7 @@ static u32 hash_v6(const struct sk_buff *skb)
#endif #endif
static unsigned int static unsigned int
nfqueue_tg_v1(struct sk_buff *skb, const struct xt_target_param *par) nfqueue_tg_v1(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_NFQ_info_v1 *info = par->targinfo; const struct xt_NFQ_info_v1 *info = par->targinfo;
u32 queue = info->queuenum; u32 queue = info->queuenum;

2
net/netfilter/xt_NOTRACK.c
View File

@ -13,7 +13,7 @@ MODULE_ALIAS("ipt_NOTRACK");
MODULE_ALIAS("ip6t_NOTRACK"); MODULE_ALIAS("ip6t_NOTRACK");
static unsigned int static unsigned int
notrack_tg(struct sk_buff *skb, const struct xt_target_param *par) notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
/* Previously seen (loopback)? Ignore. */ /* Previously seen (loopback)? Ignore. */
if (skb->nfct != NULL) if (skb->nfct != NULL)

2
net/netfilter/xt_RATEEST.c
View File

@ -73,7 +73,7 @@ void xt_rateest_put(struct xt_rateest *est)
EXPORT_SYMBOL_GPL(xt_rateest_put); EXPORT_SYMBOL_GPL(xt_rateest_put);
static unsigned int static unsigned int
xt_rateest_tg(struct sk_buff *skb, const struct xt_target_param *par) xt_rateest_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_rateest_target_info *info = par->targinfo; const struct xt_rateest_target_info *info = par->targinfo;
struct gnet_stats_basic_packed *stats = &info->est->bstats; struct gnet_stats_basic_packed *stats = &info->est->bstats;

2
net/netfilter/xt_SECMARK.c
View File

@ -30,7 +30,7 @@ MODULE_ALIAS("ip6t_SECMARK");
static u8 mode; static u8 mode;
static unsigned int static unsigned int
secmark_tg(struct sk_buff *skb, const struct xt_target_param *par) secmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
u32 secmark = 0; u32 secmark = 0;
const struct xt_secmark_target_info *info = par->targinfo; const struct xt_secmark_target_info *info = par->targinfo;

4
net/netfilter/xt_TCPMSS.c
View File

@ -172,7 +172,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb,
} }
static unsigned int static unsigned int
tcpmss_tg4(struct sk_buff *skb, const struct xt_target_param *par) tcpmss_tg4(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
__be16 newlen; __be16 newlen;
@ -195,7 +195,7 @@ tcpmss_tg4(struct sk_buff *skb, const struct xt_target_param *par)
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
static unsigned int static unsigned int
tcpmss_tg6(struct sk_buff *skb, const struct xt_target_param *par) tcpmss_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ipv6hdr *ipv6h = ipv6_hdr(skb); struct ipv6hdr *ipv6h = ipv6_hdr(skb);
u8 nexthdr; u8 nexthdr;

4
net/netfilter/xt_TCPOPTSTRIP.c
View File

@ -74,7 +74,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
} }
static unsigned int static unsigned int
tcpoptstrip_tg4(struct sk_buff *skb, const struct xt_target_param *par) tcpoptstrip_tg4(struct sk_buff *skb, const struct xt_action_param *par)
{ {
return tcpoptstrip_mangle_packet(skb, par->targinfo, ip_hdrlen(skb), return tcpoptstrip_mangle_packet(skb, par->targinfo, ip_hdrlen(skb),
sizeof(struct iphdr) + sizeof(struct tcphdr)); sizeof(struct iphdr) + sizeof(struct tcphdr));
@ -82,7 +82,7 @@ tcpoptstrip_tg4(struct sk_buff *skb, const struct xt_target_param *par)
#if defined(CONFIG_IP6_NF_MANGLE) || defined(CONFIG_IP6_NF_MANGLE_MODULE) #if defined(CONFIG_IP6_NF_MANGLE) || defined(CONFIG_IP6_NF_MANGLE_MODULE)
static unsigned int static unsigned int
tcpoptstrip_tg6(struct sk_buff *skb, const struct xt_target_param *par) tcpoptstrip_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct ipv6hdr *ipv6h = ipv6_hdr(skb); struct ipv6hdr *ipv6h = ipv6_hdr(skb);
int tcphoff; int tcphoff;

4
net/netfilter/xt_TEE.c
View File

@ -84,7 +84,7 @@ tee_tg_route4(struct sk_buff *skb, const struct xt_tee_tginfo *info)
} }
static unsigned int static unsigned int
tee_tg4(struct sk_buff *skb, const struct xt_target_param *par) tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tee_tginfo *info = par->targinfo; const struct xt_tee_tginfo *info = par->targinfo;
struct iphdr *iph; struct iphdr *iph;
@ -165,7 +165,7 @@ tee_tg_route6(struct sk_buff *skb, const struct xt_tee_tginfo *info)
} }
static unsigned int static unsigned int
tee_tg6(struct sk_buff *skb, const struct xt_target_param *par) tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tee_tginfo *info = par->targinfo; const struct xt_tee_tginfo *info = par->targinfo;

2
net/netfilter/xt_TPROXY.c
View File

@ -25,7 +25,7 @@
#include <net/netfilter/nf_tproxy_core.h> #include <net/netfilter/nf_tproxy_core.h>
static unsigned int static unsigned int
tproxy_tg(struct sk_buff *skb, const struct xt_target_param *par) tproxy_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
const struct xt_tproxy_target_info *tgi = par->targinfo; const struct xt_tproxy_target_info *tgi = par->targinfo;

2
net/netfilter/xt_TRACE.c
View File

@ -11,7 +11,7 @@ MODULE_ALIAS("ipt_TRACE");
MODULE_ALIAS("ip6t_TRACE"); MODULE_ALIAS("ip6t_TRACE");
static unsigned int static unsigned int
trace_tg(struct sk_buff *skb, const struct xt_target_param *par) trace_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
skb->nf_trace = 1; skb->nf_trace = 1;
return XT_CONTINUE; return XT_CONTINUE;

2
net/netfilter/xt_cluster.c
View File

@ -86,7 +86,7 @@ xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
} }
static bool static bool
xt_cluster_mt(const struct sk_buff *skb, const struct xt_match_param *par) xt_cluster_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct sk_buff *pskb = (struct sk_buff *)skb; struct sk_buff *pskb = (struct sk_buff *)skb;
const struct xt_cluster_match_info *info = par->matchinfo; const struct xt_cluster_match_info *info = par->matchinfo;

2
net/netfilter/xt_comment.c
View File

@ -16,7 +16,7 @@ MODULE_ALIAS("ipt_comment");
MODULE_ALIAS("ip6t_comment"); MODULE_ALIAS("ip6t_comment");
static bool static bool
comment_mt(const struct sk_buff *skb, const struct xt_match_param *par) comment_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
/* We always match */ /* We always match */
return true; return true;

2
net/netfilter/xt_connbytes.c
View File

@ -18,7 +18,7 @@ MODULE_ALIAS("ipt_connbytes");
MODULE_ALIAS("ip6t_connbytes"); MODULE_ALIAS("ip6t_connbytes");
static bool static bool
connbytes_mt(const struct sk_buff *skb, const struct xt_match_param *par) connbytes_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_connbytes_info *sinfo = par->matchinfo; const struct xt_connbytes_info *sinfo = par->matchinfo;
const struct nf_conn *ct; const struct nf_conn *ct;

2
net/netfilter/xt_connlimit.c
View File

@ -173,7 +173,7 @@ static int count_them(struct net *net,
} }
static bool static bool
connlimit_mt(const struct sk_buff *skb, const struct xt_match_param *par) connlimit_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct net *net = dev_net(par->in ? par->in : par->out); struct net *net = dev_net(par->in ? par->in : par->out);
const struct xt_connlimit_info *info = par->matchinfo; const struct xt_connlimit_info *info = par->matchinfo;

4
net/netfilter/xt_connmark.c
View File

@ -37,7 +37,7 @@ MODULE_ALIAS("ipt_connmark");
MODULE_ALIAS("ip6t_connmark"); MODULE_ALIAS("ip6t_connmark");
static unsigned int static unsigned int
connmark_tg(struct sk_buff *skb, const struct xt_target_param *par) connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_connmark_tginfo1 *info = par->targinfo; const struct xt_connmark_tginfo1 *info = par->targinfo;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
@ -91,7 +91,7 @@ static void connmark_tg_destroy(const struct xt_tgdtor_param *par)
} }
static bool static bool
connmark_mt(const struct sk_buff *skb, const struct xt_match_param *par) connmark_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_connmark_mtinfo1 *info = par->matchinfo; const struct xt_connmark_mtinfo1 *info = par->matchinfo;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;

6
net/netfilter/xt_conntrack.c
View File

@ -113,7 +113,7 @@ ct_proto_port_check(const struct xt_conntrack_mtinfo2 *info,
} }
static bool static bool
conntrack_mt(const struct sk_buff *skb, const struct xt_match_param *par, conntrack_mt(const struct sk_buff *skb, const struct xt_action_param *par,
u16 state_mask, u16 status_mask) u16 state_mask, u16 status_mask)
{ {
const struct xt_conntrack_mtinfo2 *info = par->matchinfo; const struct xt_conntrack_mtinfo2 *info = par->matchinfo;
@ -191,7 +191,7 @@ conntrack_mt(const struct sk_buff *skb, const struct xt_match_param *par,
} }
static bool static bool
conntrack_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par) conntrack_mt_v1(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_conntrack_mtinfo1 *info = par->matchinfo; const struct xt_conntrack_mtinfo1 *info = par->matchinfo;
@ -199,7 +199,7 @@ conntrack_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par)
} }
static bool static bool
conntrack_mt_v2(const struct sk_buff *skb, const struct xt_match_param *par) conntrack_mt_v2(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_conntrack_mtinfo2 *info = par->matchinfo; const struct xt_conntrack_mtinfo2 *info = par->matchinfo;

2
net/netfilter/xt_dccp.c
View File

@ -96,7 +96,7 @@ match_option(u_int8_t option, const struct sk_buff *skb, unsigned int protoff,
} }
static bool static bool
dccp_mt(const struct sk_buff *skb, const struct xt_match_param *par) dccp_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_dccp_info *info = par->matchinfo; const struct xt_dccp_info *info = par->matchinfo;
const struct dccp_hdr *dh; const struct dccp_hdr *dh;

7
net/netfilter/xt_dscp.c
View File

@ -25,7 +25,7 @@ MODULE_ALIAS("ipt_tos");
MODULE_ALIAS("ip6t_tos"); MODULE_ALIAS("ip6t_tos");
static bool static bool
dscp_mt(const struct sk_buff *skb, const struct xt_match_param *par) dscp_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_dscp_info *info = par->matchinfo; const struct xt_dscp_info *info = par->matchinfo;
u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT; u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;
@ -34,7 +34,7 @@ dscp_mt(const struct sk_buff *skb, const struct xt_match_param *par)
} }
static bool static bool
dscp_mt6(const struct sk_buff *skb, const struct xt_match_param *par) dscp_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_dscp_info *info = par->matchinfo; const struct xt_dscp_info *info = par->matchinfo;
u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT; u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;
@ -54,7 +54,8 @@ static int dscp_mt_check(const struct xt_mtchk_param *par)
return 0; return 0;
} }
static bool tos_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool tos_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct xt_tos_match_info *info = par->matchinfo; const struct xt_tos_match_info *info = par->matchinfo;

3
net/netfilter/xt_esp.c
View File

@ -36,7 +36,8 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
return r; return r;
} }
static bool esp_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool esp_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct ip_esp_hdr *eh; const struct ip_esp_hdr *eh;
struct ip_esp_hdr _esp; struct ip_esp_hdr _esp;

2
net/netfilter/xt_hashlimit.c
View File

@ -516,7 +516,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo,
} }
static bool static bool
hashlimit_mt(const struct sk_buff *skb, const struct xt_match_param *par) hashlimit_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_hashlimit_mtinfo1 *info = par->matchinfo; const struct xt_hashlimit_mtinfo1 *info = par->matchinfo;
struct xt_hashlimit_htable *hinfo = info->hinfo; struct xt_hashlimit_htable *hinfo = info->hinfo;

2
net/netfilter/xt_helper.c
View File

@ -24,7 +24,7 @@ MODULE_ALIAS("ip6t_helper");
static bool static bool
helper_mt(const struct sk_buff *skb, const struct xt_match_param *par) helper_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_helper_info *info = par->matchinfo; const struct xt_helper_info *info = par->matchinfo;
const struct nf_conn *ct; const struct nf_conn *ct;

6
net/netfilter/xt_hl.c
View File

@ -25,7 +25,8 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_ttl"); MODULE_ALIAS("ipt_ttl");
MODULE_ALIAS("ip6t_hl"); MODULE_ALIAS("ip6t_hl");
static bool ttl_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool ttl_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct ipt_ttl_info *info = par->matchinfo; const struct ipt_ttl_info *info = par->matchinfo;
const u8 ttl = ip_hdr(skb)->ttl; const u8 ttl = ip_hdr(skb)->ttl;
@ -44,7 +45,8 @@ static bool ttl_mt(const struct sk_buff *skb, const struct xt_match_param *par)
return false; return false;
} }
static bool hl_mt6(const struct sk_buff *skb, const struct xt_match_param *par) static bool hl_mt6(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct ip6t_hl_info *info = par->matchinfo; const struct ip6t_hl_info *info = par->matchinfo;
const struct ipv6hdr *ip6h = ipv6_hdr(skb); const struct ipv6hdr *ip6h = ipv6_hdr(skb);

4
net/netfilter/xt_iprange.c
View File

@ -17,7 +17,7 @@
#include <linux/netfilter/xt_iprange.h> #include <linux/netfilter/xt_iprange.h>
static bool static bool
iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par) iprange_mt4(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_iprange_mtinfo *info = par->matchinfo; const struct xt_iprange_mtinfo *info = par->matchinfo;
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
@ -68,7 +68,7 @@ iprange_ipv6_sub(const struct in6_addr *a, const struct in6_addr *b)
} }
static bool static bool
iprange_mt6(const struct sk_buff *skb, const struct xt_match_param *par) iprange_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_iprange_mtinfo *info = par->matchinfo; const struct xt_iprange_mtinfo *info = par->matchinfo;
const struct ipv6hdr *iph = ipv6_hdr(skb); const struct ipv6hdr *iph = ipv6_hdr(skb);

4
net/netfilter/xt_length.c
View File

@ -21,7 +21,7 @@ MODULE_ALIAS("ipt_length");
MODULE_ALIAS("ip6t_length"); MODULE_ALIAS("ip6t_length");
static bool static bool
length_mt(const struct sk_buff *skb, const struct xt_match_param *par) length_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_length_info *info = par->matchinfo; const struct xt_length_info *info = par->matchinfo;
u_int16_t pktlen = ntohs(ip_hdr(skb)->tot_len); u_int16_t pktlen = ntohs(ip_hdr(skb)->tot_len);
@ -30,7 +30,7 @@ length_mt(const struct sk_buff *skb, const struct xt_match_param *par)
} }
static bool static bool
length_mt6(const struct sk_buff *skb, const struct xt_match_param *par) length_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_length_info *info = par->matchinfo; const struct xt_length_info *info = par->matchinfo;
const u_int16_t pktlen = ntohs(ipv6_hdr(skb)->payload_len) + const u_int16_t pktlen = ntohs(ipv6_hdr(skb)->payload_len) +

2
net/netfilter/xt_limit.c
View File

@ -65,7 +65,7 @@ static DEFINE_SPINLOCK(limit_lock);
#define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ) #define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ)
static bool static bool
limit_mt(const struct sk_buff *skb, const struct xt_match_param *par) limit_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_rateinfo *r = par->matchinfo; const struct xt_rateinfo *r = par->matchinfo;
struct xt_limit_priv *priv = r->master; struct xt_limit_priv *priv = r->master;

3
net/netfilter/xt_mac.c
View File

@ -25,7 +25,8 @@ MODULE_DESCRIPTION("Xtables: MAC address match");
MODULE_ALIAS("ipt_mac"); MODULE_ALIAS("ipt_mac");
MODULE_ALIAS("ip6t_mac"); MODULE_ALIAS("ip6t_mac");
static bool mac_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool mac_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct xt_mac_info *info = par->matchinfo; const struct xt_mac_info *info = par->matchinfo;
bool ret; bool ret;

4
net/netfilter/xt_mark.c
View File

@ -25,7 +25,7 @@ MODULE_ALIAS("ipt_MARK");
MODULE_ALIAS("ip6t_MARK"); MODULE_ALIAS("ip6t_MARK");
static unsigned int static unsigned int
mark_tg(struct sk_buff *skb, const struct xt_target_param *par) mark_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_mark_tginfo2 *info = par->targinfo; const struct xt_mark_tginfo2 *info = par->targinfo;
@ -34,7 +34,7 @@ mark_tg(struct sk_buff *skb, const struct xt_target_param *par)
} }
static bool static bool
mark_mt(const struct sk_buff *skb, const struct xt_match_param *par) mark_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_mark_mtinfo1 *info = par->matchinfo; const struct xt_mark_mtinfo1 *info = par->matchinfo;

2
net/netfilter/xt_multiport.c
View File

@ -72,7 +72,7 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
} }
static bool static bool
multiport_mt(const struct sk_buff *skb, const struct xt_match_param *par) multiport_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const __be16 *pptr; const __be16 *pptr;
__be16 _ports[2]; __be16 _ports[2];

4
net/netfilter/xt_osf.c
View File

@ -193,8 +193,8 @@ static inline int xt_osf_ttl(const struct sk_buff *skb, const struct xt_osf_info
return ip->ttl == f_ttl; return ip->ttl == f_ttl;
} }
static bool xt_osf_match_packet(const struct sk_buff *skb, static bool
const struct xt_match_param *p) xt_osf_match_packet(const struct sk_buff *skb, const struct xt_action_param *p)
{ {
const struct xt_osf_info *info = p->matchinfo; const struct xt_osf_info *info = p->matchinfo;
const struct iphdr *ip = ip_hdr(skb); const struct iphdr *ip = ip_hdr(skb);

2
net/netfilter/xt_owner.c
View File

@ -18,7 +18,7 @@
#include <linux/netfilter/xt_owner.h> #include <linux/netfilter/xt_owner.h>
static bool static bool
owner_mt(const struct sk_buff *skb, const struct xt_match_param *par) owner_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_owner_match_info *info = par->matchinfo; const struct xt_owner_match_info *info = par->matchinfo;
const struct file *filp; const struct file *filp;

2
net/netfilter/xt_physdev.c
View File

@ -22,7 +22,7 @@ MODULE_ALIAS("ip6t_physdev");
static bool static bool
physdev_mt(const struct sk_buff *skb, const struct xt_match_param *par) physdev_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long)))); static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long))));
const struct xt_physdev_info *info = par->matchinfo; const struct xt_physdev_info *info = par->matchinfo;

2
net/netfilter/xt_pkttype.c
View File

@ -23,7 +23,7 @@ MODULE_ALIAS("ipt_pkttype");
MODULE_ALIAS("ip6t_pkttype"); MODULE_ALIAS("ip6t_pkttype");
static bool static bool
pkttype_mt(const struct sk_buff *skb, const struct xt_match_param *par) pkttype_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_pkttype_info *info = par->matchinfo; const struct xt_pkttype_info *info = par->matchinfo;
u_int8_t type; u_int8_t type;

2
net/netfilter/xt_policy.c
View File

@ -110,7 +110,7 @@ match_policy_out(const struct sk_buff *skb, const struct xt_policy_info *info,
} }
static bool static bool
policy_mt(const struct sk_buff *skb, const struct xt_match_param *par) policy_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_policy_info *info = par->matchinfo; const struct xt_policy_info *info = par->matchinfo;
int ret; int ret;

2
net/netfilter/xt_quota.c
View File

@ -23,7 +23,7 @@ MODULE_ALIAS("ip6t_quota");
static DEFINE_SPINLOCK(quota_lock); static DEFINE_SPINLOCK(quota_lock);
static bool static bool
quota_mt(const struct sk_buff *skb, const struct xt_match_param *par) quota_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct xt_quota_info *q = (void *)par->matchinfo; struct xt_quota_info *q = (void *)par->matchinfo;
struct xt_quota_priv *priv = q->master; struct xt_quota_priv *priv = q->master;

2
net/netfilter/xt_rateest.c
View File

@ -15,7 +15,7 @@
static bool static bool
xt_rateest_mt(const struct sk_buff *skb, const struct xt_match_param *par) xt_rateest_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_rateest_match_info *info = par->matchinfo; const struct xt_rateest_match_info *info = par->matchinfo;
struct gnet_stats_rate_est *r; struct gnet_stats_rate_est *r;

2
net/netfilter/xt_realm.c
View File

@ -22,7 +22,7 @@ MODULE_DESCRIPTION("Xtables: Routing realm match");
MODULE_ALIAS("ipt_realm"); MODULE_ALIAS("ipt_realm");
static bool static bool
realm_mt(const struct sk_buff *skb, const struct xt_match_param *par) realm_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_realm_info *info = par->matchinfo; const struct xt_realm_info *info = par->matchinfo;
const struct dst_entry *dst = skb_dst(skb); const struct dst_entry *dst = skb_dst(skb);

2
net/netfilter/xt_recent.c
View File

@ -224,7 +224,7 @@ static void recent_table_flush(struct recent_table *t)
} }
static bool static bool
recent_mt(const struct sk_buff *skb, const struct xt_match_param *par) recent_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
struct net *net = dev_net(par->in ? par->in : par->out); struct net *net = dev_net(par->in ? par->in : par->out);
struct recent_net *recent_net = recent_pernet(net); struct recent_net *recent_net = recent_pernet(net);

2
net/netfilter/xt_sctp.c
View File

@ -114,7 +114,7 @@ match_packet(const struct sk_buff *skb,
} }
static bool static bool
sctp_mt(const struct sk_buff *skb, const struct xt_match_param *par) sctp_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_sctp_info *info = par->matchinfo; const struct xt_sctp_info *info = par->matchinfo;
const sctp_sctphdr_t *sh; const sctp_sctphdr_t *sh;

6
net/netfilter/xt_socket.c
View File

@ -88,7 +88,7 @@ extract_icmp_fields(const struct sk_buff *skb,
static bool static bool
socket_match(const struct sk_buff *skb, const struct xt_match_param *par, socket_match(const struct sk_buff *skb, const struct xt_action_param *par,
const struct xt_socket_mtinfo1 *info) const struct xt_socket_mtinfo1 *info)
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
@ -174,13 +174,13 @@ socket_match(const struct sk_buff *skb, const struct xt_match_param *par,
} }
static bool static bool
socket_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par) socket_mt_v0(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
return socket_match(skb, par, NULL); return socket_match(skb, par, NULL);
} }
static bool static bool
socket_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par) socket_mt_v1(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
return socket_match(skb, par, par->matchinfo); return socket_match(skb, par, par->matchinfo);
} }

2
net/netfilter/xt_state.c
View File

@ -21,7 +21,7 @@ MODULE_ALIAS("ipt_state");
MODULE_ALIAS("ip6t_state"); MODULE_ALIAS("ip6t_state");
static bool static bool
state_mt(const struct sk_buff *skb, const struct xt_match_param *par) state_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_state_info *sinfo = par->matchinfo; const struct xt_state_info *sinfo = par->matchinfo;
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;

2
net/netfilter/xt_statistic.c
View File

@ -30,7 +30,7 @@ MODULE_ALIAS("ip6t_statistic");
static DEFINE_SPINLOCK(nth_lock); static DEFINE_SPINLOCK(nth_lock);
static bool static bool
statistic_mt(const struct sk_buff *skb, const struct xt_match_param *par) statistic_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_statistic_info *info = par->matchinfo; const struct xt_statistic_info *info = par->matchinfo;
bool ret = info->flags & XT_STATISTIC_INVERT; bool ret = info->flags & XT_STATISTIC_INVERT;

2
net/netfilter/xt_string.c
View File

@ -23,7 +23,7 @@ MODULE_ALIAS("ipt_string");
MODULE_ALIAS("ip6t_string"); MODULE_ALIAS("ip6t_string");
static bool static bool
string_mt(const struct sk_buff *skb, const struct xt_match_param *par) string_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_string_info *conf = par->matchinfo; const struct xt_string_info *conf = par->matchinfo;
struct ts_state state; struct ts_state state;

2
net/netfilter/xt_tcpmss.c
View File

@ -25,7 +25,7 @@ MODULE_ALIAS("ipt_tcpmss");
MODULE_ALIAS("ip6t_tcpmss"); MODULE_ALIAS("ip6t_tcpmss");
static bool static bool
tcpmss_mt(const struct sk_buff *skb, const struct xt_match_param *par) tcpmss_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tcpmss_match_info *info = par->matchinfo; const struct xt_tcpmss_match_info *info = par->matchinfo;
const struct tcphdr *th; const struct tcphdr *th;

6
net/netfilter/xt_tcpudp.c
View File

@ -62,7 +62,8 @@ tcp_find_option(u_int8_t option,
return invert; return invert;
} }
static bool tcp_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool tcp_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct tcphdr *th; const struct tcphdr *th;
struct tcphdr _tcph; struct tcphdr _tcph;
@ -128,7 +129,8 @@ static int tcp_mt_check(const struct xt_mtchk_param *par)
return (tcpinfo->invflags & ~XT_TCP_INV_MASK) ? -EINVAL : 0; return (tcpinfo->invflags & ~XT_TCP_INV_MASK) ? -EINVAL : 0;
} }
static bool udp_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool udp_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct udphdr *uh; const struct udphdr *uh;
struct udphdr _udph; struct udphdr _udph;

2
net/netfilter/xt_time.c
View File

@ -152,7 +152,7 @@ static void localtime_3(struct xtm *r, time_t time)
} }
static bool static bool
time_mt(const struct sk_buff *skb, const struct xt_match_param *par) time_mt(const struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_time_info *info = par->matchinfo; const struct xt_time_info *info = par->matchinfo;
unsigned int packet_time; unsigned int packet_time;

3
net/netfilter/xt_u32.c
View File

@ -86,7 +86,8 @@ static bool u32_match_it(const struct xt_u32 *data,
return true; return true;
} }
static bool u32_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool u32_mt(const struct sk_buff *skb,
const struct xt_action_param *par)
{ {
const struct xt_u32 *data = par->matchinfo; const struct xt_u32 *data = par->matchinfo;
bool ret; bool ret;

2
net/sched/act_ipt.c
View File

@ -199,7 +199,7 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
{ {
int ret = 0, result = 0; int ret = 0, result = 0;
struct tcf_ipt *ipt = a->priv; struct tcf_ipt *ipt = a->priv;
struct xt_target_param par; struct xt_action_param par;
if (skb_cloned(skb)) { if (skb_cloned(skb)) {
if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))