diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:30:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:30:50 -0500 |
commit | 221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43 (patch) | |
tree | 1961ab9f9061b595e10449a24e7275d91f422de2 /net/ipv4 | |
parent | 0e6024519b4da2d9413b97be1de8122d5709ccc1 (diff) |
netns xfrm: state lookup in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ah4.c | 2 | ||||
-rw-r--r-- | net/ipv4/esp4.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipcomp.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 992ecd8662e2..750426b0a276 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
@@ -209,7 +209,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) | |||
209 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) | 209 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) |
210 | return; | 210 | return; |
211 | 211 | ||
212 | x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET); | 212 | x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET); |
213 | if (!x) | 213 | if (!x) |
214 | return; | 214 | return; |
215 | printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n", | 215 | printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n", |
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 95a9c65003f8..35950128aa94 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
@@ -421,7 +421,7 @@ static void esp4_err(struct sk_buff *skb, u32 info) | |||
421 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) | 421 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) |
422 | return; | 422 | return; |
423 | 423 | ||
424 | x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET); | 424 | x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET); |
425 | if (!x) | 425 | if (!x) |
426 | return; | 426 | return; |
427 | NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n", | 427 | NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n", |
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 0a35f1b6f22c..3262ce06294c 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
@@ -35,7 +35,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) | |||
35 | return; | 35 | return; |
36 | 36 | ||
37 | spi = htonl(ntohs(ipch->cpi)); | 37 | spi = htonl(ntohs(ipch->cpi)); |
38 | x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, | 38 | x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, |
39 | spi, IPPROTO_COMP, AF_INET); | 39 | spi, IPPROTO_COMP, AF_INET); |
40 | if (!x) | 40 | if (!x) |
41 | return; | 41 | return; |
@@ -85,7 +85,7 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x) | |||
85 | int err = 0; | 85 | int err = 0; |
86 | struct xfrm_state *t; | 86 | struct xfrm_state *t; |
87 | 87 | ||
88 | t = xfrm_state_lookup((xfrm_address_t *)&x->id.daddr.a4, | 88 | t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr.a4, |
89 | x->props.saddr.a4, IPPROTO_IPIP, AF_INET); | 89 | x->props.saddr.a4, IPPROTO_IPIP, AF_INET); |
90 | if (!t) { | 90 | if (!t) { |
91 | t = ipcomp_tunnel_create(x); | 91 | t = ipcomp_tunnel_create(x); |