netns xfrm: AH/ESP in netns!
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7013ec30e0
commit
4fb236bac9
|
@ -201,6 +201,7 @@ out:
|
||||||
|
|
||||||
static void ah4_err(struct sk_buff *skb, u32 info)
|
static void ah4_err(struct sk_buff *skb, u32 info)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(skb->dev);
|
||||||
struct iphdr *iph = (struct iphdr *)skb->data;
|
struct iphdr *iph = (struct iphdr *)skb->data;
|
||||||
struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2));
|
struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2));
|
||||||
struct xfrm_state *x;
|
struct xfrm_state *x;
|
||||||
|
@ -209,7 +210,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
|
||||||
icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
|
icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
|
x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
|
||||||
if (!x)
|
if (!x)
|
||||||
return;
|
return;
|
||||||
printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",
|
printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",
|
||||||
|
@ -314,6 +315,7 @@ static struct net_protocol ah4_protocol = {
|
||||||
.handler = xfrm4_rcv,
|
.handler = xfrm4_rcv,
|
||||||
.err_handler = ah4_err,
|
.err_handler = ah4_err,
|
||||||
.no_policy = 1,
|
.no_policy = 1,
|
||||||
|
.netns_ok = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init ah4_init(void)
|
static int __init ah4_init(void)
|
||||||
|
|
|
@ -413,6 +413,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
|
||||||
|
|
||||||
static void esp4_err(struct sk_buff *skb, u32 info)
|
static void esp4_err(struct sk_buff *skb, u32 info)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(skb->dev);
|
||||||
struct iphdr *iph = (struct iphdr *)skb->data;
|
struct iphdr *iph = (struct iphdr *)skb->data;
|
||||||
struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data+(iph->ihl<<2));
|
struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data+(iph->ihl<<2));
|
||||||
struct xfrm_state *x;
|
struct xfrm_state *x;
|
||||||
|
@ -421,7 +422,7 @@ static void esp4_err(struct sk_buff *skb, u32 info)
|
||||||
icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
|
icmp_hdr(skb)->code != ICMP_FRAG_NEEDED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);
|
x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET);
|
||||||
if (!x)
|
if (!x)
|
||||||
return;
|
return;
|
||||||
NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",
|
NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",
|
||||||
|
@ -618,6 +619,7 @@ static struct net_protocol esp4_protocol = {
|
||||||
.handler = xfrm4_rcv,
|
.handler = xfrm4_rcv,
|
||||||
.err_handler = esp4_err,
|
.err_handler = esp4_err,
|
||||||
.no_policy = 1,
|
.no_policy = 1,
|
||||||
|
.netns_ok = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init esp4_init(void)
|
static int __init esp4_init(void)
|
||||||
|
|
|
@ -407,6 +407,7 @@ out:
|
||||||
static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
||||||
int type, int code, int offset, __be32 info)
|
int type, int code, int offset, __be32 info)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(skb->dev);
|
||||||
struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
||||||
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset);
|
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset);
|
||||||
struct xfrm_state *x;
|
struct xfrm_state *x;
|
||||||
|
@ -415,7 +416,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
||||||
type != ICMPV6_PKT_TOOBIG)
|
type != ICMPV6_PKT_TOOBIG)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);
|
x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET6);
|
||||||
if (!x)
|
if (!x)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -356,6 +356,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
|
||||||
static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
||||||
int type, int code, int offset, __be32 info)
|
int type, int code, int offset, __be32 info)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(skb->dev);
|
||||||
struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
||||||
struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset);
|
struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset);
|
||||||
struct xfrm_state *x;
|
struct xfrm_state *x;
|
||||||
|
@ -364,7 +365,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
||||||
type != ICMPV6_PKT_TOOBIG)
|
type != ICMPV6_PKT_TOOBIG)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
|
x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
|
||||||
if (!x)
|
if (!x)
|
||||||
return;
|
return;
|
||||||
printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%pI6\n",
|
printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%pI6\n",
|
||||||
|
|
Loading…
Reference in a new issue