Skip to content

Commit

Permalink
[NETNS][IPV6] route6 - Pass the network namespace parameter to rt6_lo…
Browse files Browse the repository at this point in the history 
…okup

Add a network namespace parameter to rt6_lookup().

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>
  • Loading branch information
Daniel Lezcano authored and David S. Miller committed Mar 4, 2008
1 parent cdb1876 commit 606a2b4
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion include/net/ip6_route.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ extern void rt6_sndmsg(int type, struct in6_addr *dst,
int dstlen, int srclen,
int metric, __u32 flags);

extern struct rt6_info *rt6_lookup(struct in6_addr *daddr,
extern struct rt6_info *rt6_lookup(struct net *net,
struct in6_addr *daddr,
struct in6_addr *saddr,
int oif, int flags);

Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/addrconf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
struct rt6_info *rt;

ipv6_addr_prefix(&prefix, &ifp->addr, ifp->prefix_len);
rt = rt6_lookup(&prefix, NULL, ifp->idev->dev->ifindex, 1);
rt = rt6_lookup(&init_net, &prefix, NULL, ifp->idev->dev->ifindex, 1);

if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) {
if (onlink == 0) {
Expand Down Expand Up @@ -1700,7 +1700,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)

if (pinfo->onlink) {
struct rt6_info *rt;
rt = rt6_lookup(&pinfo->prefix, NULL, dev->ifindex, 1);
rt = rt6_lookup(&init_net, &pinfo->prefix, NULL, dev->ifindex, 1);

if (rt && ((rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0)) {
if (rt->rt6i_flags&RTF_EXPIRES) {
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/anycast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr)
if (ifindex == 0) {
struct rt6_info *rt;

rt = rt6_lookup(addr, NULL, 0, 0);
rt = rt6_lookup(&init_net, addr, NULL, 0, 0);
if (rt) {
dev = rt->rt6i_dev;
dev_hold(dev);
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/ip6_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
skb_reset_network_header(skb2);

/* Try to guess incoming interface */
rt = rt6_lookup(&ipv6_hdr(skb2)->saddr, NULL, 0, 0);
rt = rt6_lookup(&init_net, &ipv6_hdr(skb2)->saddr, NULL, 0, 0);

if (rt && rt->rt6i_dev)
skb2->dev = rt->rt6i_dev;
Expand Down Expand Up @@ -1112,7 +1112,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)
int strict = (ipv6_addr_type(&p->raddr) &
(IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL));

struct rt6_info *rt = rt6_lookup(&p->raddr, &p->laddr,
struct rt6_info *rt = rt6_lookup(&init_net, &p->raddr, &p->laddr,
p->link, strict);

if (rt == NULL)
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/mcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)

if (ifindex == 0) {
struct rt6_info *rt;
rt = rt6_lookup(addr, NULL, 0, 0);
rt = rt6_lookup(&init_net, addr, NULL, 0, 0);
if (rt) {
dev = rt->rt6i_dev;
dev_hold(dev);
Expand Down Expand Up @@ -294,7 +294,7 @@ static struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex)
if (ifindex == 0) {
struct rt6_info *rt;

rt = rt6_lookup(group, NULL, 0, 0);
rt = rt6_lookup(&init_net, group, NULL, 0, 0);
if (rt) {
dev = rt->rt6i_dev;
dev_hold(dev);
Expand Down
10 changes: 5 additions & 5 deletions net/ipv6/route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,8 @@ static struct rt6_info *ip6_pol_route_lookup(struct fib6_table *table,

}

struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr,
int oif, int strict)
struct rt6_info *rt6_lookup(struct net *net, struct in6_addr *daddr,
struct in6_addr *saddr, int oif, int strict)
{
struct flowi fl = {
.oif = oif,
Expand All @@ -572,7 +572,7 @@ struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr,
flags |= RT6_LOOKUP_F_HAS_SADDR;
}

dst = fib6_rule_lookup(&init_net, &fl, flags, ip6_pol_route_lookup);
dst = fib6_rule_lookup(net, &fl, flags, ip6_pol_route_lookup);
if (dst->error == 0)
return (struct rt6_info *) dst;

Expand Down Expand Up @@ -1159,7 +1159,7 @@ int ip6_route_add(struct fib6_config *cfg)
if (!(gwa_type&IPV6_ADDR_UNICAST))
goto out;

grt = rt6_lookup(gw_addr, NULL, cfg->fc_ifindex, 1);
grt = rt6_lookup(&init_net, gw_addr, NULL, cfg->fc_ifindex, 1);

err = -EHOSTUNREACH;
if (grt == NULL)
Expand Down Expand Up @@ -1483,7 +1483,7 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
struct rt6_info *rt, *nrt;
int allfrag = 0;

rt = rt6_lookup(daddr, saddr, dev->ifindex, 0);
rt = rt6_lookup(dev->nd_net, daddr, saddr, dev->ifindex, 0);
if (rt == NULL)
return;

Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/sit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
skb_reset_network_header(skb2);

/* Try to guess incoming interface */
rt6i = rt6_lookup(&iph6->saddr, NULL, NULL, 0);
rt6i = rt6_lookup(&init_net, &iph6->saddr, NULL, NULL, 0);
if (rt6i && rt6i->rt6i_dev) {
skb2->dev = rt6i->rt6i_dev;

rt6i = rt6_lookup(&iph6->daddr, &iph6->saddr, NULL, 0);
rt6i = rt6_lookup(&init_net, &iph6->daddr, &iph6->saddr, NULL, 0);

if (rt6i && rt6i->rt6i_dev && rt6i->rt6i_dev->type == ARPHRD_SIT) {
struct ip_tunnel *t = netdev_priv(rt6i->rt6i_dev);
Expand Down

0 comments on commit 606a2b4

Please sign in to comment.