Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92df254 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: ipcomp support 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1664773

net/ipv4/ipcomp.c

+6 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


static void ipcomp4_err(struct sk_buff *skb, u32 info)

{

	struct net *net = dev_net(skb->dev);

	__be32 spi;

	struct iphdr *iph = (struct iphdr *)skb->data;

	struct ip_comp_hdr *ipch = (struct ip_comp_hdr *)(skb->data+(iph->ihl<<2));
@@ -35,7 +36,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) 
		return;



	spi = htonl(ntohs(ipch->cpi));

	x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr,

	x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr,

			      spi, IPPROTO_COMP, AF_INET);

	if (!x)

		return;
@@ -47,9 +48,10 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) 
/* We always hold one tunnel user reference to indicate a tunnel */

static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)

{

	struct net *net = xs_net(x);

	struct xfrm_state *t;



	t = xfrm_state_alloc(&init_net);

	t = xfrm_state_alloc(net);

	if (t == NULL)

		goto out;
@@ -82,10 +84,11 @@ error: 
 */

static int ipcomp_tunnel_attach(struct xfrm_state *x)

{

	struct net *net = xs_net(x);

	int err = 0;

	struct xfrm_state *t;



	t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr.a4,

	t = xfrm_state_lookup(net, (xfrm_address_t *)&x->id.daddr.a4,

			      x->props.saddr.a4, IPPROTO_IPIP, AF_INET);

	if (!t) {

		t = ipcomp_tunnel_create(x);