lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: af_info: add network namespace parameter to route hook

Browse Source 
This is required to eventually replace the rt6_lookup call in
xt_addrtype.c with nf_afinfo->route().

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Florian Westphal
2011-04-04 16:56:29 +02:00
committed by Patrick McHardy
parent a09d19779f
commit 31ad3dd64e
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/netfilter.h
View File

@@ -270,7 +270,8 @@ struct nf_afinfo {
unsigned int dataoff, unsigned int dataoff,
unsigned int len, unsigned int len,
u_int8_t protocol); u_int8_t protocol);
int (*route)(struct dst_entry **dst, struct flowi *fl); int (*route)(struct net *net, struct dst_entry **dst,
struct flowi *fl);
void (*saveroute)(const struct sk_buff *skb, void (*saveroute)(const struct sk_buff *skb,
struct nf_queue_entry *entry); struct nf_queue_entry *entry);
int (*reroute)(struct sk_buff *skb, int (*reroute)(struct sk_buff *skb,

5
net/ipv4/netfilter.c
View File

@@ -221,9 +221,10 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
return csum; return csum;
} }
static int nf_ip_route(struct dst_entry **dst, struct flowi *fl) static int nf_ip_route(struct net *net, struct dst_entry **dst,
struct flowi *fl)
{ {
struct rtable *rt = ip_route_output_key(&init_net, &fl->u.ip4); struct rtable *rt = ip_route_output_key(net, &fl->u.ip4);
if (IS_ERR(rt)) if (IS_ERR(rt))
return PTR_ERR(rt); return PTR_ERR(rt);
*dst = &rt->dst; *dst = &rt->dst;

5
net/ipv6/netfilter.c
View File

@@ -90,9 +90,10 @@ static int nf_ip6_reroute(struct sk_buff *skb,
return 0; return 0;
} }
static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl) static int nf_ip6_route(struct net *net, struct dst_entry **dst,
struct flowi *fl)
{ {
*dst = ip6_route_output(&init_net, NULL, &fl->u.ip6); *dst = ip6_route_output(net, NULL, &fl->u.ip6);
return (*dst)->error; return (*dst)->error;
} }

8
net/netfilter/nf_conntrack_h323_main.c
View File

@@ -731,9 +731,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,
memset(&fl2, 0, sizeof(fl2)); memset(&fl2, 0, sizeof(fl2));
fl2.daddr = dst->ip; fl2.daddr = dst->ip;
if (!afinfo->route((struct dst_entry **)&rt1, if (!afinfo->route(&init_net, (struct dst_entry **)&rt1,
flowi4_to_flowi(&fl1))) { flowi4_to_flowi(&fl1))) {
if (!afinfo->route((struct dst_entry **)&rt2, if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
flowi4_to_flowi(&fl2))) { flowi4_to_flowi(&fl2))) {
if (rt1->rt_gateway == rt2->rt_gateway && if (rt1->rt_gateway == rt2->rt_gateway &&
rt1->dst.dev == rt2->dst.dev) rt1->dst.dev == rt2->dst.dev)
@@ -755,9 +755,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,
memset(&fl2, 0, sizeof(fl2)); memset(&fl2, 0, sizeof(fl2));
ipv6_addr_copy(&fl2.daddr, &dst->in6); ipv6_addr_copy(&fl2.daddr, &dst->in6);
if (!afinfo->route((struct dst_entry **)&rt1, if (!afinfo->route(&init_net, (struct dst_entry **)&rt1,
flowi6_to_flowi(&fl1))) { flowi6_to_flowi(&fl1))) {
if (!afinfo->route((struct dst_entry **)&rt2, if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
flowi6_to_flowi(&fl2))) { flowi6_to_flowi(&fl2))) {
if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway, if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,
sizeof(rt1->rt6i_gateway)) && sizeof(rt1->rt6i_gateway)) &&

2
net/netfilter/xt_TCPMSS.c
View File

@@ -166,7 +166,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb,
rcu_read_lock(); rcu_read_lock();
ai = nf_get_afinfo(family); ai = nf_get_afinfo(family);
if (ai != NULL) if (ai != NULL)
ai->route((struct dst_entry **)&rt, &fl); ai->route(&init_net, (struct dst_entry **)&rt, &fl);
rcu_read_unlock(); rcu_read_unlock();
if (rt != NULL) { if (rt != NULL) {