Skip to content

Commit

Permalink
[NETNS][IPV6] route6 - make route6 per namespace
Browse files Browse the repository at this point in the history
This patch makes the routing engine use the network namespaces to
access routing informations: Add a network namespace parameter to
ipv6_route_ioctl and propagate the network namespace value to all the
routing code that have not yet been changed.

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 7b4da53 commit 5578689
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 51 deletions.
4 changes: 3 additions & 1 deletion include/net/ip6_route.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ extern struct dst_entry * ip6_route_output(struct sock *sk,
extern int ip6_route_init(void);
extern void ip6_route_cleanup(void);

extern int ipv6_route_ioctl(unsigned int cmd, void __user *arg);
extern int ipv6_route_ioctl(struct net *net,
unsigned int cmd,
void __user *arg);

extern int ip6_route_add(struct fib6_config *cfg);
extern int ip6_ins_rt(struct rt6_info *);
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/af_inet6.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ EXPORT_SYMBOL(inet6_getname);
int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
struct sock *sk = sock->sk;
struct net *net = sk->sk_net;

switch(cmd)
{
Expand All @@ -452,7 +453,7 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCADDRT:
case SIOCDELRT:

return(ipv6_route_ioctl(cmd,(void __user *)arg));
return(ipv6_route_ioctl(net, cmd, (void __user *)arg));

case SIOCSIFADDR:
return addrconf_add_ifaddr((void __user *) arg);
Expand Down
Loading

0 comments on commit 5578689

Please sign in to comment.