niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

[NETNS][IPV6] icmp6 - make icmpv6_socket per namespace

Browse source 
This patch make the changes necessary to support network namespaces in
ICMPv6.

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Benjamin Thery 2008-03-05 10:49:18 -08:00 • committed by David S. Miller
parent da6bb5c0c5
commit 9a43b709a2
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/ipv6/icmp.c
View file

@ -163,6 +163,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
struct flowi *fl) struct flowi *fl)
{ {
struct dst_entry *dst; struct dst_entry *dst;
struct net *net = sk->sk_net;
int res = 0; int res = 0;
/* Informational messages are not limited. */ /* Informational messages are not limited. */
@ -178,7 +179,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(&init_net, sk, fl); dst = ip6_route_output(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);
@ -186,7 +187,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
res = 1; res = 1;
} else { } else {
struct rt6_info *rt = (struct rt6_info *)dst; struct rt6_info *rt = (struct rt6_info *)dst;
int tmo = init_net.ipv6.sysctl.icmpv6_time; int tmo = net->ipv6.sysctl.icmpv6_time;
/* Give more bandwidth to wider prefixes. */ /* Give more bandwidth to wider prefixes. */
if (rt->rt6i_dst.plen < 128) if (rt->rt6i_dst.plen < 128)
@ -305,6 +306,7 @@ static inline void mip6_addr_swap(struct sk_buff *skb) {}
void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
struct net_device *dev) struct net_device *dev)
{ {
struct net *net = skb->dev->nd_net;
struct inet6_dev *idev = NULL; struct inet6_dev *idev = NULL;
struct ipv6hdr *hdr = ipv6_hdr(skb); struct ipv6hdr *hdr = ipv6_hdr(skb);
struct sock *sk; struct sock *sk;
@ -334,7 +336,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
*/ */
addr_type = ipv6_addr_type(&hdr->daddr); addr_type = ipv6_addr_type(&hdr->daddr);
if (ipv6_chk_addr(&init_net, &hdr->daddr, skb->dev, 0)) if (ipv6_chk_addr(net, &hdr->daddr, skb->dev, 0))
saddr = &hdr->daddr; saddr = &hdr->daddr;
/* /*
@ -391,7 +393,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
fl.fl_icmp_code = code; fl.fl_icmp_code = code;
security_skb_classify_flow(skb, &fl); security_skb_classify_flow(skb, &fl);
sk = icmpv6_sk(&init_net); sk = icmpv6_sk(net);
np = inet6_sk(sk); np = inet6_sk(sk);
if (icmpv6_xmit_lock(sk)) if (icmpv6_xmit_lock(sk))
@ -507,6 +509,7 @@ EXPORT_SYMBOL(icmpv6_send);
static void icmpv6_echo_reply(struct sk_buff *skb) static void icmpv6_echo_reply(struct sk_buff *skb)
{ {
struct net *net = skb->dev->nd_net;
struct sock *sk; struct sock *sk;
struct inet6_dev *idev; struct inet6_dev *idev;
struct ipv6_pinfo *np; struct ipv6_pinfo *np;
@ -537,7 +540,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
fl.fl_icmp_type = ICMPV6_ECHO_REPLY; fl.fl_icmp_type = ICMPV6_ECHO_REPLY;
security_skb_classify_flow(skb, &fl); security_skb_classify_flow(skb, &fl);
sk = icmpv6_sk(&init_net); sk = icmpv6_sk(net);
np = inet6_sk(sk); np = inet6_sk(sk);
if (icmpv6_xmit_lock(sk)) if (icmpv6_xmit_lock(sk))