diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-01-22 23:49:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:12 -0800 |
| commit | eee80592c3c1f7381c04913d9d3eb6e3c3c87628 (patch) | |
| tree | e8c7bd98745450abbb290d35ef531c7c9673ba4c /include | |
| parent | 7ba699c604ab811972eee2e041fd6b07659a2e6e (diff) | |
| download | kernel_samsung_aries-eee80592c3c1f7381c04913d9d3eb6e3c3c87628.zip kernel_samsung_aries-eee80592c3c1f7381c04913d9d3eb6e3c3c87628.tar.gz kernel_samsung_aries-eee80592c3c1f7381c04913d9d3eb6e3c3c87628.tar.bz2 | |
[NETNS]: Correct namespace for connect-time routing.
ip_route_connect and ip_route_newports are a part of routing API
presented to the socket layer. The namespace is available inside them
through a socket.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/route.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index d9b876a..1985d82 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -33,6 +33,7 @@ #include <linux/ip.h> #include <linux/cache.h> #include <linux/security.h> +#include <net/sock.h> #ifndef __KERNEL__ #warning This file is not supposed to be used outside of kernel. @@ -157,8 +158,9 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, .dport = dport } } }; int err; + struct net *net = sk->sk_net; if (!dst || !src) { - err = __ip_route_output_key(&init_net, rp, &fl); + err = __ip_route_output_key(net, rp, &fl); if (err) return err; fl.fl4_dst = (*rp)->rt_dst; @@ -167,7 +169,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, *rp = NULL; } security_sk_classify_flow(sk, &fl); - return ip_route_output_flow(&init_net, rp, &fl, sk, flags); + return ip_route_output_flow(net, rp, &fl, sk, flags); } static inline int ip_route_newports(struct rtable **rp, u8 protocol, @@ -184,7 +186,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol, ip_rt_put(*rp); *rp = NULL; security_sk_classify_flow(sk, &fl); - return ip_route_output_flow(&init_net, rp, &fl, sk, 0); + return ip_route_output_flow(sk->sk_net, rp, &fl, sk, 0); } return 0; } |