mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 22:11:38 +08:00
netfilter: utils: move nf_ip6_checksum* from ipv6 to utils
similar to previous change, this also allows to remove it from nf_ipv6_ops and avoid the indirection. It also removes the bogus dependency of nf_conntrack_ipv6 on ipv6 module: ipv6 checksum functions are built into kernel even if CONFIG_IPV6=m, but ipv6/netfilter.o isn't. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
d7e5a9a502
commit
ebee5a50d0
@ -30,11 +30,6 @@ struct nf_ipv6_ops {
|
|||||||
void (*route_input)(struct sk_buff *skb);
|
void (*route_input)(struct sk_buff *skb);
|
||||||
int (*fragment)(struct net *net, struct sock *sk, struct sk_buff *skb,
|
int (*fragment)(struct net *net, struct sock *sk, struct sk_buff *skb,
|
||||||
int (*output)(struct net *, struct sock *, struct sk_buff *));
|
int (*output)(struct net *, struct sock *, struct sk_buff *));
|
||||||
__sum16 (*checksum)(struct sk_buff *skb, unsigned int hook,
|
|
||||||
unsigned int dataoff, u_int8_t protocol);
|
|
||||||
__sum16 (*checksum_partial)(struct sk_buff *skb, unsigned int hook,
|
|
||||||
unsigned int dataoff, unsigned int len,
|
|
||||||
u_int8_t protocol);
|
|
||||||
int (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl,
|
int (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl,
|
||||||
bool strict);
|
bool strict);
|
||||||
int (*reroute)(struct sk_buff *skb, const struct nf_queue_entry *entry);
|
int (*reroute)(struct sk_buff *skb, const struct nf_queue_entry *entry);
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
#include <net/ipv6.h>
|
#include <net/ipv6.h>
|
||||||
#include <net/ip6_route.h>
|
#include <net/ip6_route.h>
|
||||||
#include <net/xfrm.h>
|
#include <net/xfrm.h>
|
||||||
#include <net/ip6_checksum.h>
|
|
||||||
#include <net/netfilter/nf_queue.h>
|
#include <net/netfilter/nf_queue.h>
|
||||||
|
|
||||||
int ip6_route_me_harder(struct net *net, struct sk_buff *skb)
|
int ip6_route_me_harder(struct net *net, struct sk_buff *skb)
|
||||||
@ -106,71 +105,10 @@ static int nf_ip6_route(struct net *net, struct dst_entry **dst,
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
|
|
||||||
unsigned int dataoff, u_int8_t protocol)
|
|
||||||
{
|
|
||||||
const struct ipv6hdr *ip6h = ipv6_hdr(skb);
|
|
||||||
__sum16 csum = 0;
|
|
||||||
|
|
||||||
switch (skb->ip_summed) {
|
|
||||||
case CHECKSUM_COMPLETE:
|
|
||||||
if (hook != NF_INET_PRE_ROUTING && hook != NF_INET_LOCAL_IN)
|
|
||||||
break;
|
|
||||||
if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
|
|
||||||
skb->len - dataoff, protocol,
|
|
||||||
csum_sub(skb->csum,
|
|
||||||
skb_checksum(skb, 0,
|
|
||||||
dataoff, 0)))) {
|
|
||||||
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* fall through */
|
|
||||||
case CHECKSUM_NONE:
|
|
||||||
skb->csum = ~csum_unfold(
|
|
||||||
csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
|
|
||||||
skb->len - dataoff,
|
|
||||||
protocol,
|
|
||||||
csum_sub(0,
|
|
||||||
skb_checksum(skb, 0,
|
|
||||||
dataoff, 0))));
|
|
||||||
csum = __skb_checksum_complete(skb);
|
|
||||||
}
|
|
||||||
return csum;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(nf_ip6_checksum);
|
|
||||||
|
|
||||||
static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
|
||||||
unsigned int dataoff, unsigned int len,
|
|
||||||
u_int8_t protocol)
|
|
||||||
{
|
|
||||||
const struct ipv6hdr *ip6h = ipv6_hdr(skb);
|
|
||||||
__wsum hsum;
|
|
||||||
__sum16 csum = 0;
|
|
||||||
|
|
||||||
switch (skb->ip_summed) {
|
|
||||||
case CHECKSUM_COMPLETE:
|
|
||||||
if (len == skb->len - dataoff)
|
|
||||||
return nf_ip6_checksum(skb, hook, dataoff, protocol);
|
|
||||||
/* fall through */
|
|
||||||
case CHECKSUM_NONE:
|
|
||||||
hsum = skb_checksum(skb, 0, dataoff, 0);
|
|
||||||
skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
|
|
||||||
&ip6h->daddr,
|
|
||||||
skb->len - dataoff,
|
|
||||||
protocol,
|
|
||||||
csum_sub(0, hsum)));
|
|
||||||
skb->ip_summed = CHECKSUM_NONE;
|
|
||||||
return __skb_checksum_complete_head(skb, dataoff + len);
|
|
||||||
}
|
|
||||||
return csum;
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct nf_ipv6_ops ipv6ops = {
|
static const struct nf_ipv6_ops ipv6ops = {
|
||||||
.chk_addr = ipv6_chk_addr,
|
.chk_addr = ipv6_chk_addr,
|
||||||
.route_input = ip6_route_input,
|
.route_input = ip6_route_input,
|
||||||
.fragment = ip6_fragment,
|
.fragment = ip6_fragment,
|
||||||
.checksum = nf_ip6_checksum,
|
|
||||||
.checksum_partial = nf_ip6_checksum_partial,
|
|
||||||
.route = nf_ip6_route,
|
.route = nf_ip6_route,
|
||||||
.reroute = nf_ip6_reroute,
|
.reroute = nf_ip6_reroute,
|
||||||
};
|
};
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include <linux/netfilter_ipv4.h>
|
#include <linux/netfilter_ipv4.h>
|
||||||
#include <linux/netfilter_ipv6.h>
|
#include <linux/netfilter_ipv6.h>
|
||||||
#include <net/netfilter/nf_queue.h>
|
#include <net/netfilter/nf_queue.h>
|
||||||
|
#include <net/ip6_checksum.h>
|
||||||
|
|
||||||
#ifdef CONFIG_INET
|
#ifdef CONFIG_INET
|
||||||
__sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
|
__sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
|
||||||
@ -59,11 +60,69 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
|||||||
return csum;
|
return csum;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
|
||||||
|
unsigned int dataoff, u8 protocol)
|
||||||
|
{
|
||||||
|
const struct ipv6hdr *ip6h = ipv6_hdr(skb);
|
||||||
|
__sum16 csum = 0;
|
||||||
|
|
||||||
|
switch (skb->ip_summed) {
|
||||||
|
case CHECKSUM_COMPLETE:
|
||||||
|
if (hook != NF_INET_PRE_ROUTING && hook != NF_INET_LOCAL_IN)
|
||||||
|
break;
|
||||||
|
if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
|
||||||
|
skb->len - dataoff, protocol,
|
||||||
|
csum_sub(skb->csum,
|
||||||
|
skb_checksum(skb, 0,
|
||||||
|
dataoff, 0)))) {
|
||||||
|
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* fall through */
|
||||||
|
case CHECKSUM_NONE:
|
||||||
|
skb->csum = ~csum_unfold(
|
||||||
|
csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
|
||||||
|
skb->len - dataoff,
|
||||||
|
protocol,
|
||||||
|
csum_sub(0,
|
||||||
|
skb_checksum(skb, 0,
|
||||||
|
dataoff, 0))));
|
||||||
|
csum = __skb_checksum_complete(skb);
|
||||||
|
}
|
||||||
|
return csum;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(nf_ip6_checksum);
|
||||||
|
|
||||||
|
static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
||||||
|
unsigned int dataoff, unsigned int len,
|
||||||
|
u8 protocol)
|
||||||
|
{
|
||||||
|
const struct ipv6hdr *ip6h = ipv6_hdr(skb);
|
||||||
|
__wsum hsum;
|
||||||
|
__sum16 csum = 0;
|
||||||
|
|
||||||
|
switch (skb->ip_summed) {
|
||||||
|
case CHECKSUM_COMPLETE:
|
||||||
|
if (len == skb->len - dataoff)
|
||||||
|
return nf_ip6_checksum(skb, hook, dataoff, protocol);
|
||||||
|
/* fall through */
|
||||||
|
case CHECKSUM_NONE:
|
||||||
|
hsum = skb_checksum(skb, 0, dataoff, 0);
|
||||||
|
skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
|
||||||
|
&ip6h->daddr,
|
||||||
|
skb->len - dataoff,
|
||||||
|
protocol,
|
||||||
|
csum_sub(0, hsum)));
|
||||||
|
skb->ip_summed = CHECKSUM_NONE;
|
||||||
|
return __skb_checksum_complete_head(skb, dataoff + len);
|
||||||
|
}
|
||||||
|
return csum;
|
||||||
|
};
|
||||||
|
|
||||||
__sum16 nf_checksum(struct sk_buff *skb, unsigned int hook,
|
__sum16 nf_checksum(struct sk_buff *skb, unsigned int hook,
|
||||||
unsigned int dataoff, u_int8_t protocol,
|
unsigned int dataoff, u8 protocol,
|
||||||
unsigned short family)
|
unsigned short family)
|
||||||
{
|
{
|
||||||
const struct nf_ipv6_ops *v6ops;
|
|
||||||
__sum16 csum = 0;
|
__sum16 csum = 0;
|
||||||
|
|
||||||
switch (family) {
|
switch (family) {
|
||||||
@ -71,9 +130,7 @@ __sum16 nf_checksum(struct sk_buff *skb, unsigned int hook,
|
|||||||
csum = nf_ip_checksum(skb, hook, dataoff, protocol);
|
csum = nf_ip_checksum(skb, hook, dataoff, protocol);
|
||||||
break;
|
break;
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
v6ops = rcu_dereference(nf_ipv6_ops);
|
csum = nf_ip6_checksum(skb, hook, dataoff, protocol);
|
||||||
if (v6ops)
|
|
||||||
csum = v6ops->checksum(skb, hook, dataoff, protocol);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,9 +140,8 @@ EXPORT_SYMBOL_GPL(nf_checksum);
|
|||||||
|
|
||||||
__sum16 nf_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
__sum16 nf_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
||||||
unsigned int dataoff, unsigned int len,
|
unsigned int dataoff, unsigned int len,
|
||||||
u_int8_t protocol, unsigned short family)
|
u8 protocol, unsigned short family)
|
||||||
{
|
{
|
||||||
const struct nf_ipv6_ops *v6ops;
|
|
||||||
__sum16 csum = 0;
|
__sum16 csum = 0;
|
||||||
|
|
||||||
switch (family) {
|
switch (family) {
|
||||||
@ -94,10 +150,8 @@ __sum16 nf_checksum_partial(struct sk_buff *skb, unsigned int hook,
|
|||||||
protocol);
|
protocol);
|
||||||
break;
|
break;
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
v6ops = rcu_dereference(nf_ipv6_ops);
|
csum = nf_ip6_checksum_partial(skb, hook, dataoff, len,
|
||||||
if (v6ops)
|
protocol);
|
||||||
csum = v6ops->checksum_partial(skb, hook, dataoff, len,
|
|
||||||
protocol);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user