diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:59:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:59:27 -0500 |
commit | 4fb236bac9fc7d51e2267866de6d4c30e549d2f8 (patch) | |
tree | e3d024fe85be93a81553a910f556b818c8a85496 /net/ipv4/ah4.c | |
parent | 7013ec30e0e2bc5b1e602e19a4e0668f9b7c0a72 (diff) |
netns xfrm: AH/ESP in netns!
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r-- | net/ipv4/ah4.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 750426b0a276..e878e494296e 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
@@ -201,6 +201,7 @@ out: | |||
201 | 201 | ||
202 | static void ah4_err(struct sk_buff *skb, u32 info) | 202 | static void ah4_err(struct sk_buff *skb, u32 info) |
203 | { | 203 | { |
204 | struct net *net = dev_net(skb->dev); | ||
204 | struct iphdr *iph = (struct iphdr *)skb->data; | 205 | struct iphdr *iph = (struct iphdr *)skb->data; |
205 | struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2)); | 206 | struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2)); |
206 | struct xfrm_state *x; | 207 | struct xfrm_state *x; |
@@ -209,7 +210,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) | |||
209 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) | 210 | icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) |
210 | return; | 211 | return; |
211 | 212 | ||
212 | x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET); | 213 | x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET); |
213 | if (!x) | 214 | if (!x) |
214 | return; | 215 | return; |
215 | printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n", | 216 | printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n", |
@@ -314,6 +315,7 @@ static struct net_protocol ah4_protocol = { | |||
314 | .handler = xfrm4_rcv, | 315 | .handler = xfrm4_rcv, |
315 | .err_handler = ah4_err, | 316 | .err_handler = ah4_err, |
316 | .no_policy = 1, | 317 | .no_policy = 1, |
318 | .netns_ok = 1, | ||
317 | }; | 319 | }; |
318 | 320 | ||
319 | static int __init ah4_init(void) | 321 | static int __init ah4_init(void) |