netfilter: x_tables: use NFPROTO_* in extensions
Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:

committed by
Patrick McHardy

parent
7e9c6eeb13
commit
ee999d8b95
@@ -78,7 +78,7 @@ hl_tg6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_target hl_tg6_reg __read_mostly = {
|
||||
.name = "HL",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.target = hl_tg6,
|
||||
.targetsize = sizeof(struct ip6t_HL_info),
|
||||
.table = "mangle",
|
||||
|
@@ -449,7 +449,8 @@ log_tg6(struct sk_buff *skb, const struct net_device *in,
|
||||
li.u.log.level = loginfo->level;
|
||||
li.u.log.logflags = loginfo->logflags;
|
||||
|
||||
ip6t_log_packet(PF_INET6, hooknum, skb, in, out, &li, loginfo->prefix);
|
||||
ip6t_log_packet(NFPROTO_IPV6, hooknum, skb, in, out,
|
||||
&li, loginfo->prefix);
|
||||
return XT_CONTINUE;
|
||||
}
|
||||
|
||||
@@ -475,7 +476,7 @@ log_tg6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_target log_tg6_reg __read_mostly = {
|
||||
.name = "LOG",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.target = log_tg6,
|
||||
.targetsize = sizeof(struct ip6t_log_info),
|
||||
.checkentry = log_tg6_check,
|
||||
@@ -495,7 +496,7 @@ static int __init log_tg6_init(void)
|
||||
ret = xt_register_target(&log_tg6_reg);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
nf_log_register(PF_INET6, &ip6t_logger);
|
||||
nf_log_register(NFPROTO_IPV6, &ip6t_logger);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@@ -237,7 +237,7 @@ reject_tg6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_target reject_tg6_reg __read_mostly = {
|
||||
.name = "REJECT",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.target = reject_tg6,
|
||||
.targetsize = sizeof(struct ip6t_reject_info),
|
||||
.table = "filter",
|
||||
|
@@ -110,7 +110,7 @@ ah_mt6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_match ah_mt6_reg __read_mostly = {
|
||||
.name = "ah",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = ah_mt6,
|
||||
.matchsize = sizeof(struct ip6t_ah),
|
||||
.checkentry = ah_mt6_check,
|
||||
|
@@ -60,7 +60,7 @@ eui64_mt6(const struct sk_buff *skb, const struct net_device *in,
|
||||
|
||||
static struct xt_match eui64_mt6_reg __read_mostly = {
|
||||
.name = "eui64",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = eui64_mt6,
|
||||
.matchsize = sizeof(int),
|
||||
.hooks = (1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN) |
|
||||
|
@@ -127,7 +127,7 @@ frag_mt6_check(const char *tablename, const void *ip,
|
||||
|
||||
static struct xt_match frag_mt6_reg __read_mostly = {
|
||||
.name = "frag",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = frag_mt6,
|
||||
.matchsize = sizeof(struct ip6t_frag),
|
||||
.checkentry = frag_mt6_check,
|
||||
|
@@ -187,7 +187,7 @@ hbh_mt6_check(const char *tablename, const void *entry,
|
||||
static struct xt_match hbh_mt6_reg[] __read_mostly = {
|
||||
{
|
||||
.name = "hbh",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = hbh_mt6,
|
||||
.matchsize = sizeof(struct ip6t_opts),
|
||||
.checkentry = hbh_mt6_check,
|
||||
@@ -196,7 +196,7 @@ static struct xt_match hbh_mt6_reg[] __read_mostly = {
|
||||
},
|
||||
{
|
||||
.name = "dst",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = hbh_mt6,
|
||||
.matchsize = sizeof(struct ip6t_opts),
|
||||
.checkentry = hbh_mt6_check,
|
||||
|
@@ -51,7 +51,7 @@ hl_mt6(const struct sk_buff *skb, const struct net_device *in,
|
||||
|
||||
static struct xt_match hl_mt6_reg __read_mostly = {
|
||||
.name = "hl",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = hl_mt6,
|
||||
.matchsize = sizeof(struct ip6t_hl_info),
|
||||
.me = THIS_MODULE,
|
||||
|
@@ -138,7 +138,7 @@ ipv6header_mt6_check(const char *tablename, const void *ip,
|
||||
|
||||
static struct xt_match ipv6header_mt6_reg __read_mostly = {
|
||||
.name = "ipv6header",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = ipv6header_mt6,
|
||||
.matchsize = sizeof(struct ip6t_ipv6header_info),
|
||||
.checkentry = ipv6header_mt6_check,
|
||||
|
@@ -84,7 +84,7 @@ mh_mt6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_match mh_mt6_reg __read_mostly = {
|
||||
.name = "mh",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.checkentry = mh_mt6_check,
|
||||
.match = mh_mt6,
|
||||
.matchsize = sizeof(struct ip6t_mh),
|
||||
|
@@ -214,7 +214,7 @@ rt_mt6_check(const char *tablename, const void *entry,
|
||||
|
||||
static struct xt_match rt_mt6_reg __read_mostly = {
|
||||
.name = "rt",
|
||||
.family = AF_INET6,
|
||||
.family = NFPROTO_IPV6,
|
||||
.match = rt_mt6,
|
||||
.matchsize = sizeof(struct ip6t_rt),
|
||||
.checkentry = rt_mt6_check,
|
||||
|
Reference in New Issue
Block a user