redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[NETNS][IPV6] route6 - add netns parameter to ip6_route_output 

Add an netns parameter to ip6_route_output. That will allow to access
to the right routing table for outgoing traffic.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
wifi-calibration
Daniel Lezcano 2008-03-05 10:48:10 -08:00 committed by David S. Miller
parent 6fda735005
commit 4591db4f37
11 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/ip6_route.h
View File

@ -43,7 +43,8 @@ extern struct rt6_info *ip6_blk_hole_entry;
extern void ip6_route_input(struct sk_buff *skb); extern void ip6_route_input(struct sk_buff *skb);
extern struct dst_entry * ip6_route_output(struct sock *sk, extern struct dst_entry * ip6_route_output(struct net *net,
struct sock *sk,
struct flowi *fl); struct flowi *fl);
extern int ip6_route_init(void); extern int ip6_route_init(void);

2
net/ipv6/icmp.c
View File

@ -178,7 +178,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
* XXX: perhaps the expire for routing entries cloned by * XXX: perhaps the expire for routing entries cloned by
* this lookup should be more aggressive (not longer than timeout). * this lookup should be more aggressive (not longer than timeout).
*/ */
dst = ip6_route_output(sk, fl); dst = ip6_route_output(&init_net, sk, fl);
if (dst->error) { if (dst->error) {
IP6_INC_STATS(ip6_dst_idev(dst), IP6_INC_STATS(ip6_dst_idev(dst),
IPSTATS_MIB_OUTNOROUTES); IPSTATS_MIB_OUTNOROUTES);

4
net/ipv6/ip6_output.c
View File

@ -913,7 +913,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
int err; int err;
if (*dst == NULL) if (*dst == NULL)
*dst = ip6_route_output(sk, fl); *dst = ip6_route_output(&init_net, sk, fl);
if ((err = (*dst)->error)) if ((err = (*dst)->error))
goto out_err_release; goto out_err_release;
@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
dst_release(*dst); dst_release(*dst);
memcpy(&fl_gw, fl, sizeof(struct flowi)); memcpy(&fl_gw, fl, sizeof(struct flowi));
memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr)); memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr));
*dst = ip6_route_output(sk, &fl_gw); *dst = ip6_route_output(&init_net, sk, &fl_gw);
if ((err = (*dst)->error)) if ((err = (*dst)->error))
goto out_err_release; goto out_err_release;
} }

2
net/ipv6/ip6_tunnel.c
View File

@ -847,7 +847,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
if ((dst = ip6_tnl_dst_check(t)) != NULL) if ((dst = ip6_tnl_dst_check(t)) != NULL)
dst_hold(dst); dst_hold(dst);
else { else {
dst = ip6_route_output(NULL, fl); dst = ip6_route_output(&init_net, NULL, fl);
if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0) if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0)
goto tx_err_link_failure; goto tx_err_link_failure;

2
net/ipv6/ndisc.c
View File

@ -1427,7 +1427,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
icmpv6_flow_init(ndisc_socket->sk, &fl, NDISC_REDIRECT, icmpv6_flow_init(ndisc_socket->sk, &fl, NDISC_REDIRECT,
&saddr_buf, &ipv6_hdr(skb)->saddr, dev->ifindex); &saddr_buf, &ipv6_hdr(skb)->saddr, dev->ifindex);
dst = ip6_route_output(NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
if (dst == NULL) if (dst == NULL)
return; return;

4
net/ipv6/netfilter.c
View File

@ -23,7 +23,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
.saddr = iph->saddr, } }, .saddr = iph->saddr, } },
}; };
dst = ip6_route_output(skb->sk, &fl); dst = ip6_route_output(&init_net, skb->sk, &fl);
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) && if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
@ -86,7 +86,7 @@ static int nf_ip6_reroute(struct sk_buff *skb,
static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl) static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl)
{ {
*dst = ip6_route_output(NULL, fl); *dst = ip6_route_output(&init_net, NULL, fl);
return (*dst)->error; return (*dst)->error;
} }

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

@ -93,7 +93,7 @@ static void send_reset(struct sk_buff *oldskb)
fl.fl_ip_sport = otcph.dest; fl.fl_ip_sport = otcph.dest;
fl.fl_ip_dport = otcph.source; fl.fl_ip_dport = otcph.source;
security_skb_classify_flow(oldskb, &fl); security_skb_classify_flow(oldskb, &fl);
dst = ip6_route_output(NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
if (dst == NULL) if (dst == NULL)
return; return;
if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0)) if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0))

7
net/ipv6/route.c
View File

@ -772,7 +772,8 @@ static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table
return ip6_pol_route(net, table, fl->oif, fl, flags); return ip6_pol_route(net, table, fl->oif, fl, flags);
} }
struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
struct flowi *fl)
{ {
int flags = 0; int flags = 0;
@ -782,7 +783,7 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
if (!ipv6_addr_any(&fl->fl6_src)) if (!ipv6_addr_any(&fl->fl6_src))
flags |= RT6_LOOKUP_F_HAS_SADDR; flags |= RT6_LOOKUP_F_HAS_SADDR;
return fib6_rule_lookup(&init_net, fl, flags, ip6_pol_route_output); return fib6_rule_lookup(net, fl, flags, ip6_pol_route_output);
} }
EXPORT_SYMBOL(ip6_route_output); EXPORT_SYMBOL(ip6_route_output);
@ -2260,7 +2261,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb_reserve(skb, MAX_HEADER + sizeof(struct ipv6hdr)); skb_reserve(skb, MAX_HEADER + sizeof(struct ipv6hdr));
rt = (struct rt6_info*) ip6_route_output(NULL, &fl); rt = (struct rt6_info*) ip6_route_output(&init_net, NULL, &fl);
skb->dst = &rt->u.dst; skb->dst = &rt->u.dst;
err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif, err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,

2
net/ipv6/sit.c
View File

@ -393,7 +393,7 @@ isatap_srcok(struct sk_buff *skb, struct iphdr *iph, struct net_device *dev)
fl.oif = dev->ifindex; fl.oif = dev->ifindex;
security_skb_classify_flow(skb, &fl); security_skb_classify_flow(skb, &fl);
dst = ip6_route_output(NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
if (!dst->error && (dst->dev == dev) && (neigh = dst->neighbour)) { if (!dst->error && (dst->dev == dev) && (neigh = dst->neighbour)) {
addr6 = (struct in6_addr*)&neigh->primary_key; addr6 = (struct in6_addr*)&neigh->primary_key;

2
net/ipv6/xfrm6_policy.c
View File

@ -38,7 +38,7 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
if (saddr) if (saddr)
memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src)); memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src));
dst = ip6_route_output(NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
err = dst->error; err = dst->error;
if (dst->error) { if (dst->error) {

2
net/sctp/ipv6.c
View File

@ -257,7 +257,7 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
NIP6(fl.fl6_src)); NIP6(fl.fl6_src));
} }
dst = ip6_route_output(NULL, &fl); dst = ip6_route_output(&init_net, NULL, &fl);
if (!dst->error) { if (!dst->error) {
struct rt6_info *rt; struct rt6_info *rt;
rt = (struct rt6_info *)dst; rt = (struct rt6_info *)dst;